From 756e317b92b12e8080054b1d87cfc2828f33cb2d Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 7 Feb 2018 13:52:57 +0000 Subject: [PATCH] CCM NG: Abstrakte Methode getIdAttributeName in AbstractEntityRepository erstellen (#2804) git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5253 8810af33-2d31-482b-a856-94f89814c4df --- .../contentsection/AssetRepository.java | 10 +++++++- .../contentsection/ContentItemRepository.java | 5 ++++ .../ContentSectionRepository.java | 7 ++++++ .../contentsection/ContentTypeRepository.java | 5 ++++ .../contentsection/FolderRepository.java | 13 +++++++--- .../MultiPartArticleSectionRepository.java | 7 ++++++ .../LifecycleDefinitionRepository.java | 15 ++++++++---- .../lifecycle/LifecycleRepository.java | 5 ++++ .../PhaseDefinititionRepository.java | 5 ++++ .../librecms/lifecycle/PhaseRepository.java | 9 +++++-- .../org/librecms/pages/PageRepository.java | 5 ++++ .../org/librecms/pages/PagesRepository.java | 11 ++++++--- .../categorization/CategoryRepository.java | 5 ++++ .../categorization/DomainRepository.java | 17 ++++++++----- .../core/AbstractEntityRepository.java | 8 +++++++ .../libreccm/core/CcmObjectRepository.java | 5 ++++ .../org/libreccm/core/ResourceRepository.java | 5 ++++ .../libreccm/core/ResourceTypeRepository.java | 16 +++++++++---- .../pagemodel/ComponentModelRepository.java | 8 ++++++- .../pagemodel/PageModelRepository.java | 5 ++++ .../libreccm/security/GroupRepository.java | 5 ++++ .../libreccm/security/PartyRepository.java | 5 ++++ .../security/PermissionRepository.java | 24 ++++++++++++------- .../org/libreccm/security/RoleRepository.java | 5 ++++ .../org/libreccm/security/UserRepository.java | 5 ++++ .../org/libreccm/sites/SiteRepository.java | 5 ++++ .../libreccm/web/ApplicationRepository.java | 17 ++++++++----- .../workflow/AssignableTaskRepository.java | 10 ++++++-- .../workflow/TaskCommentRepository.java | 13 +++++++--- .../org/libreccm/workflow/TaskRepository.java | 11 +++++++-- .../libreccm/workflow/WorkflowRepository.java | 14 +++++++---- .../java/org/libreccm/docrepo/BlobObject.java | 3 +-- .../docrepo/BlobObjectRepository.java | 11 ++++++--- .../org/libreccm/docrepo/FileRepository.java | 14 +++++++---- .../libreccm/docrepo/FolderRepository.java | 14 +++++++---- .../docrepo/RepositoryRepository.java | 10 +++++--- .../shortcuts/ShortcutRepository.java | 7 +++++- 37 files changed, 271 insertions(+), 68 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 df17485c6..71543bee8 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/AssetRepository.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/AssetRepository.java @@ -60,6 +60,8 @@ import javax.transaction.Transactional; public class AssetRepository extends AbstractAuditedEntityRepository { + private static final long serialVersionUID = 7190032071018013125L; + private static final Logger LOGGER = LogManager .getLogger(AssetRepository.class); @@ -97,6 +99,11 @@ public class AssetRepository return Asset.class; } + @Override + public String getIdAttributeName() { + return "objectId"; + } + @Override public boolean isNew(final Asset asset) { return asset.getObjectId() == 0; @@ -200,7 +207,8 @@ public class AssetRepository final List permissions = asset.getPermissions(); for (final Permission permission : permissions) { - permissionManager.revokePrivilege(permission.getGrantedPrivilege(), + permissionManager.revokePrivilege(permission + .getGrantedPrivilege(), permission.getGrantee(), asset); } 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 622b46280..e154d2ba6 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java @@ -115,6 +115,11 @@ public class ContentItemRepository public Class getEntityClass() { return ContentItem.class; } + + @Override + public String getIdAttributeName() { + return "objectId"; + } @Override public boolean isNew(final ContentItem 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 aaa78e8a0..a5eff8a0c 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionRepository.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionRepository.java @@ -39,6 +39,8 @@ import javax.transaction.Transactional; public class ContentSectionRepository extends AbstractEntityRepository { + private static final long serialVersionUID = 4616599498399330865L; + public Optional findByLabel(final String label) { if (label == null || label.isEmpty()) { throw new IllegalArgumentException( @@ -61,6 +63,11 @@ public class ContentSectionRepository public Class getEntityClass() { return ContentSection.class; } + + @Override + public String getIdAttributeName() { + return "objectId"; + } @Override public boolean isNew(final ContentSection section) { 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 f6f95e1df..e5a0beab5 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentTypeRepository.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentTypeRepository.java @@ -54,6 +54,11 @@ public class ContentTypeRepository public Class getEntityClass() { return ContentType.class; } + + @Override + public String getIdAttributeName() { + return "objectId"; + } @Override public boolean isNew(final ContentType type) { 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 a82a65192..b49866bfb 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/FolderRepository.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/FolderRepository.java @@ -43,6 +43,8 @@ import javax.transaction.Transactional; @RequestScoped public class FolderRepository extends AbstractEntityRepository { + private static final long serialVersionUID = -2588848483908283604L; + private static final Logger LOGGER = LogManager.getLogger( FolderRepository.class); @@ -54,6 +56,11 @@ public class FolderRepository extends AbstractEntityRepository { return Folder.class; } + @Override + public String getIdAttributeName() { + return "objectId"; + } + @Override public boolean isNew(final Folder folder) { return folder.getObjectId() == 0; @@ -200,14 +207,14 @@ public class FolderRepository extends AbstractEntityRepository { } public List findSubFolders(final Folder parent) { - + final TypedQuery query = getEntityManager() .createNamedQuery("Folder.findSubFolders", Folder.class); query.setParameter("parent", parent); - + return query.getResultList(); } - + @AuthorizationRequired @Transactional(Transactional.TxType.REQUIRED) @Override 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 312f2bfe7..6fc8efae1 100644 --- a/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleSectionRepository.java +++ b/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleSectionRepository.java @@ -35,11 +35,18 @@ import javax.transaction.Transactional; public class MultiPartArticleSectionRepository extends AbstractAuditedEntityRepository { + private static final long serialVersionUID = -3392120236224057234L; + @Override public Long getEntityId(final MultiPartArticleSection entity) { return entity.getSectionId(); } + @Override + public String getIdAttributeName() { + return "sectionId"; + } + @Override public Class getEntityClass() { return MultiPartArticleSection.class; 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 bad1c1ba1..cda4aedf0 100644 --- a/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleDefinitionRepository.java +++ b/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleDefinitionRepository.java @@ -27,19 +27,24 @@ import javax.enterprise.context.RequestScoped; * @author Jens Pelzetter */ @RequestScoped -public class LifecycleDefinitionRepository - extends AbstractEntityRepository{ +public class LifecycleDefinitionRepository + extends AbstractEntityRepository { + + private static final long serialVersionUID = -6388883975391235155L; @Override public Class getEntityClass() { return LifecycleDefinition.class; } + @Override + public String getIdAttributeName() { + return "definitionId"; + } + @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 76fbf3e5c..f9e2927d8 100644 --- a/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleRepository.java +++ b/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleRepository.java @@ -33,6 +33,11 @@ public class LifecycleRepository extends AbstractEntityRepository getEntityClass() { return Lifecycle.class; } + + @Override + public String getIdAttributeName() { + return "lifecycleId"; + } @Override public boolean isNew(final Lifecycle lifecycle) { 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 332ea6292..cfb712783 100644 --- a/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseDefinititionRepository.java +++ b/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseDefinititionRepository.java @@ -35,6 +35,11 @@ public class PhaseDefinititionRepository return PhaseDefinition.class; } + @Override + public String getIdAttributeName() { + return "definitionId"; + } + @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 4209647d6..ed95e5f95 100644 --- a/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseRepository.java +++ b/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseRepository.java @@ -27,7 +27,7 @@ import javax.enterprise.context.RequestScoped; * @author Jens Pelzetter */ @RequestScoped -public class PhaseRepository extends AbstractEntityRepository{ +public class PhaseRepository extends AbstractEntityRepository { private static final long serialVersionUID = 1010039772043186415L; @@ -36,9 +36,14 @@ public class PhaseRepository extends AbstractEntityRepository{ return Phase.class; } + @Override + public String getIdAttributeName() { + return "phaseId"; + } + @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 95117c800..1457dfd4b 100644 --- a/ccm-cms/src/main/java/org/librecms/pages/PageRepository.java +++ b/ccm-cms/src/main/java/org/librecms/pages/PageRepository.java @@ -91,6 +91,11 @@ public class PageRepository extends AbstractEntityRepository { return Page.class; } + @Override + public String getIdAttributeName() { + return "objectId"; + } + @Override public boolean isNew(final Page page) { return page.getObjectId() == 0; 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 a2495a135..e173da934 100644 --- a/ccm-cms/src/main/java/org/librecms/pages/PagesRepository.java +++ b/ccm-cms/src/main/java/org/librecms/pages/PagesRepository.java @@ -82,16 +82,21 @@ public class PagesRepository extends AbstractEntityRepository { return Pages.class; } + @Override + public String getIdAttributeName() { + return "objectId"; + } + @Override public boolean isNew(final Pages pages) { return pages.getObjectId() == 0; } - + @Override public void initNewEntity(final Pages pages) { - + super.initNewEntity(pages); - + pages.setUuid(UUID.randomUUID().toString()); pages.setApplicationType(Pages.class.getName()); } 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 1cee4432c..ec9f2f470 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java @@ -65,6 +65,11 @@ public class CategoryRepository extends AbstractEntityRepository public Class getEntityClass() { return Category.class; } + + @Override + public String getIdAttributeName() { + return "objectId"; + } @Override public boolean isNew(final Category entity) { 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 8a5358754..657473ce6 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java @@ -51,6 +51,11 @@ public class DomainRepository extends AbstractEntityRepository { return Domain.class; } + @Override + public String getIdAttributeName() { + return "objectId"; + } + @Override public boolean isNew(final Domain entity) { return entity.getObjectId() == 0; @@ -79,11 +84,11 @@ public class DomainRepository extends AbstractEntityRepository { */ public Optional findByDomainKey(final String domainKey) { final TypedQuery query = getEntityManager() - .createNamedQuery("Domain.findByKey", Domain.class); + .createNamedQuery("Domain.findByKey", Domain.class); query.setParameter("key", domainKey); final EntityGraph graph = getEntityManager() - .getEntityGraph( "Domain.allCategories"); + .getEntityGraph("Domain.allCategories"); query.setHint("javax.persistence.fetchgraph", graph); try { @@ -103,7 +108,7 @@ public class DomainRepository extends AbstractEntityRepository { */ public Domain findByUri(final URI uri) { final TypedQuery query = getEntityManager() - .createNamedQuery("Domain.findByUri", Domain.class); + .createNamedQuery("Domain.findByUri", Domain.class); query.setParameter("uri", uri); return query.getSingleResult(); @@ -118,7 +123,7 @@ public class DomainRepository extends AbstractEntityRepository { */ public Optional findByUuid(final String uuid) { final TypedQuery query = getEntityManager() - .createNamedQuery("Domain.findByUuid", Domain.class); + .createNamedQuery("Domain.findByUuid", Domain.class); query.setParameter("uuid", uuid); try { @@ -130,10 +135,10 @@ public class DomainRepository extends AbstractEntityRepository { public List search(final String term) { final TypedQuery query = getEntityManager() - .createNamedQuery("Domain.search", Domain.class); + .createNamedQuery("Domain.search", Domain.class); query.setParameter("term", term); final EntityGraph graph = getEntityManager() - .getEntityGraph("Domain.withOwners"); + .getEntityGraph("Domain.withOwners"); query.setHint("javax.persistence.fetchgraph", graph); return query.getResultList(); 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 11890a77d..33932d7c4 100644 --- a/ccm-core/src/main/java/org/libreccm/core/AbstractEntityRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/AbstractEntityRepository.java @@ -123,6 +123,14 @@ public abstract class AbstractEntityRepository implements Serializable { * repository. */ public abstract Class getEntityClass(); + + /** + * Used by some methods to create queries using the JPA Criteria API. + * + * @return The name of the ID attribute/property for entities managed by + * a repository. + */ + public abstract String getIdAttributeName(); /** * Finds an entity by it ID. 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 d0548374b..64be4de55 100644 --- a/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java @@ -50,6 +50,11 @@ public class CcmObjectRepository extends AbstractEntityRepository getEntityClass() { return CcmObject.class; } + + @Override + public String getIdAttributeName() { + return "objectId"; + } @Override public boolean isNew(final CcmObject entity) { diff --git a/ccm-core/src/main/java/org/libreccm/core/ResourceRepository.java b/ccm-core/src/main/java/org/libreccm/core/ResourceRepository.java index 14baea973..941b2c8d2 100644 --- a/ccm-core/src/main/java/org/libreccm/core/ResourceRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/ResourceRepository.java @@ -44,6 +44,11 @@ public class ResourceRepository extends AbstractEntityRepository getEntityClass() { return Resource.class; } + + @Override + public String getIdAttributeName() { + return "objectId"; + } @Override public boolean isNew(final Resource entity) { diff --git a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeRepository.java b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeRepository.java index eadcd2828..0f253287e 100644 --- a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeRepository.java @@ -30,12 +30,12 @@ import java.util.Optional; * {@link ResourceType}s from the database. This is the responsibility of the * application using the {@link ResourceType}. * - * @author Tobias Osmers + * */ @RequestScoped -public class ResourceTypeRepository extends AbstractEntityRepository { +public class ResourceTypeRepository + extends AbstractEntityRepository { private static final long serialVersionUID = -6313169146990554867L; @@ -44,6 +44,11 @@ public class ResourceTypeRepository extends AbstractEntityRepository findByTitle(final String title) { final TypedQuery query = getEntityManager() - .createNamedQuery("ResourceType.findByTitle", ResourceType.class); + .createNamedQuery("ResourceType.findByTitle", ResourceType.class); query.setParameter("title", title); try { @@ -67,4 +72,5 @@ public class ResourceTypeRepository extends AbstractEntityRepositoryJens Pelzetter */ @RequestScoped -public class ComponentModelRepository extends AbstractEntityRepository { +public class ComponentModelRepository + extends AbstractEntityRepository { private static final long serialVersionUID = -6358512316472857971L; @@ -42,6 +43,11 @@ public class ComponentModelRepository extends AbstractEntityRepository { public Class getEntityClass() { return Group.class; } + + @Override + public String getIdAttributeName() { + return "partyId"; + } @Override public boolean isNew(final Group entity) { 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 dbff2ab71..5c9ddc8b1 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PartyRepository.java +++ b/ccm-core/src/main/java/org/libreccm/security/PartyRepository.java @@ -42,6 +42,11 @@ public class PartyRepository extends AbstractEntityRepository { return Party.class; } + @Override + public String getIdAttributeName() { + return "partyId"; + } + @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 5ca343b3f..ad8bc3f82 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PermissionRepository.java +++ b/ccm-core/src/main/java/org/libreccm/security/PermissionRepository.java @@ -33,7 +33,7 @@ import java.util.Optional; */ @RequestScoped public class PermissionRepository - extends AbstractEntityRepository { + extends AbstractEntityRepository { private static final long serialVersionUID = -4240674229117593486L; @@ -42,6 +42,11 @@ public class PermissionRepository return Permission.class; } + @Override + public String getIdAttributeName() { + return "permissionId"; + } + @Override public boolean isNew(Permission entity) { if (entity == null) { @@ -51,25 +56,27 @@ public class PermissionRepository } /** - * Finds a {@link Permission} by the privilege, the grantee and the - * object. Where the grantee has been granted the given privilege on the - * given object. + * Finds a {@link Permission} by the privilege, the grantee and the object. + * Where the grantee has been granted the given privilege on the given + * object. * * @param privilege The privilege, beeing granted - * @param grantee The grantee, having the privilege - * @param object The object, the privilege has been granted on + * @param grantee The grantee, having the privilege + * @param object The object, the privilege has been granted on * * @return An optional either with the found item or empty */ public Optional findByCustomPermId(final String privilege, final Role grantee, final Object object) { - final TypedQuery query = getEntityManager().createNamedQuery( + final TypedQuery query = getEntityManager() + .createNamedQuery( "Permission.findByCustomPermId", Permission.class); query.setParameter("privilege", privilege); query.setParameter("grantee", grantee); - if (object != null) + if (object != null) { query.setParameter("object", object); + } try { return Optional.of(query.getSingleResult()); @@ -77,4 +84,5 @@ public class PermissionRepository return Optional.empty(); } } + } 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 b02a1eea2..a32224705 100644 --- a/ccm-core/src/main/java/org/libreccm/security/RoleRepository.java +++ b/ccm-core/src/main/java/org/libreccm/security/RoleRepository.java @@ -44,6 +44,11 @@ public class RoleRepository extends AbstractEntityRepository { return Role.class; } + @Override + public String getIdAttributeName() { + return "roleId"; + } + @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 74af2fa23..238553a07 100644 --- a/ccm-core/src/main/java/org/libreccm/security/UserRepository.java +++ b/ccm-core/src/main/java/org/libreccm/security/UserRepository.java @@ -43,6 +43,11 @@ public class UserRepository extends AbstractEntityRepository { return User.class; } + @Override + public String getIdAttributeName() { + return "partyId"; + } + @Override public boolean isNew(final User user) { if (user == null) { 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 0bc070b69..80ce3da67 100644 --- a/ccm-core/src/main/java/org/libreccm/sites/SiteRepository.java +++ b/ccm-core/src/main/java/org/libreccm/sites/SiteRepository.java @@ -123,6 +123,11 @@ public class SiteRepository extends AbstractEntityRepository { return Site.class; } + @Override + public String getIdAttributeName() { + return "objectId"; + } + @Override public boolean isNew(final Site site) { return site.getObjectId() == 0; 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 53ac0da74..71b1abfac 100644 --- a/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java +++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java @@ -47,6 +47,11 @@ public class ApplicationRepository return CcmApplication.class; } + @Override + public String getIdAttributeName() { + return "objectId"; + } + @Override public boolean isNew(final CcmApplication application) { return application.getObjectId() == 0; @@ -54,12 +59,12 @@ public class ApplicationRepository @Override public void initNewEntity(final CcmApplication application) { - + super.initNewEntity(application); application.setUuid(UUID.randomUUID().toString()); application.setApplicationType(application.getClass().getName()); } - + /** * Retrieve the application mounted at the provided {@code path}. * @@ -108,8 +113,8 @@ public class ApplicationRepository */ public Optional findByUuid(final String uuid) { final TypedQuery query = getEntityManager() - .createNamedQuery("CcmApplication.findByUuid", - CcmApplication.class); + .createNamedQuery("CcmApplication.findByUuid", + CcmApplication.class); query.setParameter("uuid", uuid); try { @@ -118,7 +123,7 @@ public class ApplicationRepository return Optional.empty(); } } - + @AuthorizationRequired @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN) @Transactional(Transactional.TxType.REQUIRED) @@ -126,7 +131,7 @@ public class ApplicationRepository public void save(final CcmApplication application) { super.save(application); } - + @AuthorizationRequired @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN) @Transactional(Transactional.TxType.REQUIRED) 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 bdb99fc84..4caca03b9 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskRepository.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskRepository.java @@ -36,8 +36,9 @@ import java.util.stream.Collectors; * @author Jens Pelzetter */ @RequestScoped -public class AssignableTaskRepository extends AbstractEntityRepository { +public class AssignableTaskRepository + extends AbstractEntityRepository { + private static final long serialVersionUID = 2657793145163510103L; @Override @@ -45,6 +46,11 @@ public class AssignableTaskRepository extends AbstractEntityRepositoryJens Pelzetter */ @RequestScoped public class TaskRepository extends AbstractEntityRepository { + private static final long serialVersionUID = -8366096936911158514L; @Override @@ -41,6 +42,11 @@ public class TaskRepository extends AbstractEntityRepository { return Task.class; } + @Override + public String getIdAttributeName() { + return "taskId"; + } + @Override public boolean isNew(final Task task) { return task.getTaskId() == 0; @@ -62,7 +68,7 @@ public class TaskRepository extends AbstractEntityRepository { @Transactional(Transactional.TxType.REQUIRED) public Optional findByUuid(final String uuid) { final TypedQuery query = getEntityManager().createNamedQuery( - "Task.findByUuid", Task.class); + "Task.findByUuid", Task.class); query.setParameter("uuid", uuid); try { @@ -71,4 +77,5 @@ public class TaskRepository extends AbstractEntityRepository { return Optional.empty(); } } + } 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 3108895a4..875ae6be1 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowRepository.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowRepository.java @@ -34,6 +34,7 @@ import java.util.UUID; */ @RequestScoped public class WorkflowRepository extends AbstractEntityRepository { + private static final long serialVersionUID = -8811728904958517569L; @Override @@ -41,6 +42,11 @@ public class WorkflowRepository extends AbstractEntityRepository return Workflow.class; } + @Override + public String getIdAttributeName() { + return "workflowId"; + } + @Override public boolean isNew(final Workflow workflow) { return workflow.getWorkflowId() == 0; @@ -65,14 +71,14 @@ public class WorkflowRepository extends AbstractEntityRepository throw new IllegalArgumentException( "The UUID of the Workflow to retrieve can't be null or empty."); } - + final TypedQuery query = getEntityManager() - .createNamedQuery("Workflow.findByUuid", Workflow.class); + .createNamedQuery("Workflow.findByUuid", Workflow.class); query.setParameter("uuid", uuid); - + try { return Optional.of(query.getSingleResult()); - } catch(NoResultException ex) { + } catch (NoResultException ex) { return Optional.empty(); } } diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObject.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObject.java index 8848de14b..261b6217a 100644 --- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObject.java +++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObject.java @@ -32,9 +32,8 @@ import javax.persistence.Lob; import javax.persistence.OneToOne; import javax.persistence.Table; import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.XmlElement; + import java.io.Serializable; -import java.sql.Blob; import java.util.Arrays; import java.util.Objects; 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 f483a858f..3bb9138a1 100644 --- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectRepository.java +++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectRepository.java @@ -18,7 +18,6 @@ */ package org.libreccm.docrepo; - import org.libreccm.auditing.AbstractAuditedEntityRepository; import javax.enterprise.context.RequestScoped; @@ -33,7 +32,7 @@ import javax.persistence.EntityManager; */ @RequestScoped public class BlobObjectRepository extends - AbstractAuditedEntityRepository { + AbstractAuditedEntityRepository { @Inject private EntityManager entityManager; @@ -43,6 +42,11 @@ public class BlobObjectRepository extends return entity.getBlobObjectId(); } + @Override + public String getIdAttributeName() { + return "blobObjectId"; + } + @Override public Class getEntityClass() { return BlobObject.class; @@ -55,4 +59,5 @@ public class BlobObjectRepository extends } return entity.getBlobObjectId() == 0; } -} \ No newline at end of file + +} 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 022f923e5..1fc16d2f8 100644 --- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileRepository.java +++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileRepository.java @@ -34,27 +34,33 @@ public class FileRepository extends AbstractResourceRepository { classOfT = File.class; } + @Override + public String getIdAttributeName() { + return "objectId"; + } + @Override public TypedQuery getFindByNameQuery() { return entityManager.createNamedQuery( - "DocRepo.findFileByName", File.class); + "DocRepo.findFileByName", File.class); } @Override public TypedQuery getFindByPathNameQuery() { return entityManager.createNamedQuery( - "DocRepo.findFileByPath", File.class); + "DocRepo.findFileByPath", File.class); } @Override public TypedQuery getFindForCreatorQuery() { return entityManager.createNamedQuery( - "DocRepo.findCreatedFileFromUser", File.class); + "DocRepo.findCreatedFileFromUser", File.class); } @Override public TypedQuery getFindForModifierQuery() { return entityManager.createNamedQuery( - "DocRepo.findModifiedFileFromUser", File.class); + "DocRepo.findModifiedFileFromUser", File.class); } + } 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 419dd168b..88619906c 100644 --- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderRepository.java +++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderRepository.java @@ -34,27 +34,33 @@ public class FolderRepository extends AbstractResourceRepository { classOfT = Folder.class; } + @Override + public String getIdAttributeName() { + return "objectId"; + } + @Override public TypedQuery getFindByNameQuery() { return entityManager.createNamedQuery( - "DocRepo.findFolderByName", Folder.class); + "DocRepo.findFolderByName", Folder.class); } @Override public TypedQuery getFindByPathNameQuery() { return entityManager.createNamedQuery( - "DocRepo.findFolderByPath", Folder.class); + "DocRepo.findFolderByPath", Folder.class); } @Override public TypedQuery getFindForCreatorQuery() { return entityManager.createNamedQuery( - "DocRepo.findCreatedFolderFromUser", Folder.class); + "DocRepo.findCreatedFolderFromUser", Folder.class); } @Override public TypedQuery getFindForModifierQuery() { return entityManager.createNamedQuery( - "DocRepo.findModifiedFolderFromUser", Folder.class); + "DocRepo.findModifiedFolderFromUser", Folder.class); } + } 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 b2b69fceb..264c17b0d 100644 --- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryRepository.java +++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryRepository.java @@ -34,11 +34,10 @@ import java.util.stream.Collectors; * Repository class for retrieving, storing and deleting {@code Repository}s. * * @author Tobias Osmers - * @version 25/11/2015 */ @RequestScoped -public class RepositoryRepository extends - AbstractAuditedEntityRepository { +public class RepositoryRepository + extends AbstractAuditedEntityRepository { @Inject private EntityManager entityManager; @@ -48,6 +47,11 @@ public class RepositoryRepository extends return entity.getObjectId(); } + @Override + public String getIdAttributeName() { + return "objectId"; + } + @Override public Class getEntityClass() { return Repository.class; 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 c05d6fb7c..7fcdfa8cd 100644 --- a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutRepository.java +++ b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutRepository.java @@ -34,7 +34,7 @@ import javax.transaction.Transactional; /** * Repository class for {@link Shortcut} entities. - * + * * @author Alexander Konermann */ @RequestScoped @@ -48,6 +48,11 @@ public class ShortcutRepository extends AbstractEntityRepository return Shortcut.class; } + @Override + public String getIdAttributeName() { + return "shortcutId"; + } + @Override public boolean isNew(final Shortcut entity) { return entity.getShortcutId() == 0;