From 03e7d6dfdf45ac5e10852a94cbaf4981e24fc925 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 26 Sep 2022 16:20:18 +0200 Subject: [PATCH] Some code cleanup --- .../java/org/librecms/assets/PersonIdResolver.java | 2 +- .../libreccm/categorization/Categorization.java | 14 ++++++++------ .../categorization/CategoryIdResolver.java | 2 +- .../libreccm/categorization/DomainIdResolver.java | 2 +- .../org/libreccm/core/CcmObjectIdResolver.java | 2 +- .../java/org/libreccm/core/ResourceIdResolver.java | 2 +- .../org/libreccm/core/ResourceTypeIdResolver.java | 2 +- .../org/libreccm/security/GroupIdResolver.java | 2 +- .../org/libreccm/security/PartyIdResolver.java | 2 +- .../java/org/libreccm/security/RoleIdResolver.java | 2 +- .../org/libreccm/web/ApplicationIdResolver.java | 2 +- .../libreccm/workflow/TaskCommentIdResolver.java | 2 +- .../java/org/libreccm/workflow/TaskIdResolver.java | 2 +- .../org/libreccm/workflow/WorkflowIdResolver.java | 7 +------ 14 files changed, 21 insertions(+), 24 deletions(-) diff --git a/ccm-cms/src/main/java/org/librecms/assets/PersonIdResolver.java b/ccm-cms/src/main/java/org/librecms/assets/PersonIdResolver.java index 7d2b02ced..30ed83aec 100644 --- a/ccm-cms/src/main/java/org/librecms/assets/PersonIdResolver.java +++ b/ccm-cms/src/main/java/org/librecms/assets/PersonIdResolver.java @@ -54,7 +54,7 @@ public class PersonIdResolver implements Serializable, ObjectIdResolver { .orElseThrow( () -> new IllegalArgumentException( String.format( - "No Person with uuid %s found in the database.", + "No Person with UUID %s found in the database.", id.key.toString() ) ) diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java b/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java index a958a8e2a..8450cd68f 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java @@ -84,10 +84,10 @@ import javax.persistence.Table; @NamedQuery( name = "Categorization.findIndexObject", query = "SELECT c.categorizedObject " - + "FROM Categorization c " - + "JOIN c.category a " - + "WHERE a.uuid = :catuuid " - + "AND c.indexObject = TRUE"), + + "FROM Categorization c " + + "JOIN c.category a " + + "WHERE a.uuid = :catuuid " + + "AND c.indexObject = TRUE"), @NamedQuery( name = "Categorization.findIndexObjectCategorization", query = "SELECT c FROM Categorization c " @@ -102,8 +102,10 @@ import javax.persistence.Table; + "WHERE c.category = :category " + "AND c.indexObject = TRUE") }) -@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, - property = "uuid") +@JsonIdentityInfo( + generator = ObjectIdGenerators.PropertyGenerator.class, + property = "uuid" +) public class Categorization implements Serializable, Relation, Exportable { private static final long serialVersionUID = 201504301320L; diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java index 35b97425f..2b15bd74f 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java @@ -56,7 +56,7 @@ public class CategoryIdResolver implements Serializable, ObjectIdResolver { .orElseThrow( () -> new IllegalArgumentException( String.format( - "No Category with uuid %s in the database.", + "No Category with UUID %s in the database.", id.key.toString() ) ) diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainIdResolver.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainIdResolver.java index 471f814c6..3ce54a5f5 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/DomainIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainIdResolver.java @@ -55,7 +55,7 @@ public class DomainIdResolver implements Serializable, ObjectIdResolver { .orElseThrow( () -> new IllegalArgumentException( String.format( - "No Domain with uuid %s in the database.", + "No Domain with UUID %s in the database.", id.key.toString() ) ) diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java b/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java index d5e390128..2aa61cbb9 100644 --- a/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java @@ -56,7 +56,7 @@ public class CcmObjectIdResolver implements Serializable, ObjectIdResolver { .orElseThrow( () -> new IllegalArgumentException( String.format( - "No CcmObject with uuid %s in the database.", + "No CcmObject with UUID %s in the database.", id.key.toString() ) ) diff --git a/ccm-core/src/main/java/org/libreccm/core/ResourceIdResolver.java b/ccm-core/src/main/java/org/libreccm/core/ResourceIdResolver.java index 519b15277..698a0808d 100644 --- a/ccm-core/src/main/java/org/libreccm/core/ResourceIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/core/ResourceIdResolver.java @@ -57,7 +57,7 @@ public class ResourceIdResolver implements Serializable, ObjectIdResolver { .orElseThrow( () -> new IllegalArgumentException( String.format( - "No Resource with uuid %s in the database.", + "No Resource with UUID %s in the database.", id.key.toString() ) ) diff --git a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeIdResolver.java b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeIdResolver.java index efab62f72..e5cb4769f 100644 --- a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeIdResolver.java @@ -56,7 +56,7 @@ public class ResourceTypeIdResolver implements Serializable, ObjectIdResolver { .orElseThrow( () -> new IllegalArgumentException( String.format( - "No ResourceType with uuid %s in the database.", + "No ResourceType with UUID %s in the database.", id.key.toString() ) ) diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java index 791c66f5b..d5ea29a2c 100644 --- a/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java @@ -55,7 +55,7 @@ public class GroupIdResolver implements Serializable, ObjectIdResolver { .orElseThrow( () -> new IllegalArgumentException( String.format( - "No Group with uuid %s in the database.", + "No Group with UUID %s in the database.", id.key.toString() ) ) diff --git a/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java index 7159a352d..a3f586bbe 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java @@ -55,7 +55,7 @@ public class PartyIdResolver implements Serializable, ObjectIdResolver { .orElseThrow( () -> new IllegalArgumentException( String.format( - "No Party with uuid %s in the database.", + "No Party with UUID %s in the database.", id.key.toString() ) ) diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java index 1c2323df1..1f4c3bd2a 100644 --- a/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java @@ -55,7 +55,7 @@ public class RoleIdResolver implements Serializable, ObjectIdResolver { .orElseThrow( () -> new IllegalArgumentException( String.format( - "No Role with uuid %s in the database.", + "No Role with UUID %s in the database.", id.key.toString() ) ) diff --git a/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java index 135b2b258..0099d0b4b 100644 --- a/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java @@ -53,7 +53,7 @@ public class ApplicationIdResolver implements Serializable, ObjectIdResolver { .orElseThrow( () -> new IllegalArgumentException( String.format( - "No ccmApplications with uuid %s in the database.", + "No ccmApplications with UUID %s in the database.", id.key.toString() ) ) diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentIdResolver.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentIdResolver.java index a3530da92..b3e2d4069 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentIdResolver.java @@ -53,7 +53,7 @@ public class TaskCommentIdResolver implements Serializable, ObjectIdResolver { .orElseThrow( () -> new IllegalArgumentException( String.format( - "No task comments with uuid %s in the database.", + "No task comments with UUID %s in the database.", id.key.toString() ) ) diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskIdResolver.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskIdResolver.java index 9a73508d3..a1a3fda1b 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskIdResolver.java @@ -55,7 +55,7 @@ public class TaskIdResolver implements Serializable, ObjectIdResolver { .orElseThrow( () -> new IllegalArgumentException( String.format( - "No tasks with uuid %s in the database.", + "No tasks with UUID %s in the database.", id.key.toString() ) ) diff --git a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowIdResolver.java b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowIdResolver.java index f2e48b4a6..7ad718e82 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowIdResolver.java @@ -48,11 +48,6 @@ public class WorkflowIdResolver implements Serializable, ObjectIdResolver { @Override public Object resolveId(final ObjectIdGenerator.IdKey id) { - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final WorkflowRepository workflowRepository = cdiUtil.findBean( - WorkflowRepository.class - ); - return CdiUtil .createCdiUtil() .findBean(WorkflowRepository.class) @@ -60,7 +55,7 @@ public class WorkflowIdResolver implements Serializable, ObjectIdResolver { .orElseThrow( () -> new IllegalArgumentException( String.format( - "No workflows with uuid %s in the database.", + "No workflows with UUID %s in the database.", id.key.toString() ) )