From 4e147992536cc2cc2cf89375b3ab15ae05ad09af Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 15 Jul 2017 09:26:24 +0000 Subject: [PATCH] CCM NG: Ensure that fields of type LocalizedString are never null. git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4875 8810af33-2d31-482b-a856-94f89814c4df --- .../java/org/librecms/assets/BinaryAsset.java | 1 + .../java/org/librecms/assets/Bookmark.java | 2 +- .../org/librecms/assets/LegalMetadata.java | 1 + .../java/org/librecms/assets/SideNote.java | 1 + .../org/librecms/contentsection/Asset.java | 1 + .../contentsection/AttachmentList.java | 1 + .../librecms/contentsection/ContentType.java | 8 ++ .../org/librecms/contenttypes/Article.java | 1 + .../java/org/librecms/contenttypes/Event.java | 15 +++ .../contenttypes/MultiPartArticle.java | 3 + .../contenttypes/MultiPartArticleSection.java | 8 ++ .../java/org/librecms/contenttypes/News.java | 6 ++ .../lifecycle/LifecycleDefinition.java | 2 + .../librecms/lifecycle/PhaseDefinition.java | 2 + .../org/libreccm/categorization/Category.java | 2 + .../org/libreccm/categorization/Domain.java | 2 + .../configuration/LocalizedStringSetting.java | 1 + .../main/java/org/libreccm/core/Resource.java | 4 +- .../java/org/libreccm/core/ResourceType.java | 1 + .../formbuilder/PersistentDataQuery.java | 8 ++ .../libreccm/formbuilder/ProcessListener.java | 8 ++ .../org/libreccm/pagemodel/PageModel.java | 102 +++++++++--------- .../main/java/org/libreccm/security/Role.java | 11 +- .../main/java/org/libreccm/workflow/Task.java | 2 + .../java/org/libreccm/workflow/Workflow.java | 6 +- 25 files changed, 139 insertions(+), 60 deletions(-) diff --git a/ccm-cms/src/main/java/org/librecms/assets/BinaryAsset.java b/ccm-cms/src/main/java/org/librecms/assets/BinaryAsset.java index a39c0d254..68b694854 100644 --- a/ccm-cms/src/main/java/org/librecms/assets/BinaryAsset.java +++ b/ccm-cms/src/main/java/org/librecms/assets/BinaryAsset.java @@ -95,6 +95,7 @@ public class BinaryAsset extends Asset implements Serializable { } public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; } diff --git a/ccm-cms/src/main/java/org/librecms/assets/Bookmark.java b/ccm-cms/src/main/java/org/librecms/assets/Bookmark.java index 2c87119c9..1be0ce6d7 100644 --- a/ccm-cms/src/main/java/org/librecms/assets/Bookmark.java +++ b/ccm-cms/src/main/java/org/librecms/assets/Bookmark.java @@ -23,7 +23,6 @@ import com.arsdigita.cms.ui.assets.forms.BookmarkForm; import org.librecms.contentsection.Asset; import java.io.Serializable; -import java.net.URL; import java.util.Objects; import javax.persistence.AssociationOverride; @@ -85,6 +84,7 @@ public class Bookmark extends Asset implements Serializable { } public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; } diff --git a/ccm-cms/src/main/java/org/librecms/assets/LegalMetadata.java b/ccm-cms/src/main/java/org/librecms/assets/LegalMetadata.java index 9d202116b..242ed8469 100644 --- a/ccm-cms/src/main/java/org/librecms/assets/LegalMetadata.java +++ b/ccm-cms/src/main/java/org/librecms/assets/LegalMetadata.java @@ -116,6 +116,7 @@ public class LegalMetadata extends Asset implements Serializable { } public void setRights(final LocalizedString rights) { + Objects.requireNonNull(rights); this.rights = rights; } diff --git a/ccm-cms/src/main/java/org/librecms/assets/SideNote.java b/ccm-cms/src/main/java/org/librecms/assets/SideNote.java index f7ba92bb9..7aa752804 100644 --- a/ccm-cms/src/main/java/org/librecms/assets/SideNote.java +++ b/ccm-cms/src/main/java/org/librecms/assets/SideNote.java @@ -75,6 +75,7 @@ public class SideNote extends Asset implements Serializable { } public void setText(final LocalizedString text) { + Objects.requireNonNull(text); this.text = text; } diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/Asset.java b/ccm-cms/src/main/java/org/librecms/contentsection/Asset.java index 228a6066d..80170930d 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/Asset.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/Asset.java @@ -387,6 +387,7 @@ public class Asset extends CcmObject { } public void setTitle(final LocalizedString title) { + Objects.requireNonNull(title); this.title = title; } diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/AttachmentList.java b/ccm-cms/src/main/java/org/librecms/contentsection/AttachmentList.java index e0d2c629e..a59b76157 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/AttachmentList.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/AttachmentList.java @@ -192,6 +192,7 @@ public class AttachmentList implements Comparable, } public void setTitle(final LocalizedString title) { + Objects.requireNonNull(title); this.title = title; } diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java index 8ccd32037..a73e2138e 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java @@ -119,6 +119,12 @@ public class ContentType extends CcmObject implements Serializable { @JoinColumn(name = "DEFAULT_WORKFLOW") private WorkflowTemplate defaultWorkflow; + public ContentType() { + super(); + label = new LocalizedString(); + description = new LocalizedString(); + } + public String getContentItemClass() { return contentItemClass; } @@ -140,6 +146,7 @@ public class ContentType extends CcmObject implements Serializable { } public void setLabel(final LocalizedString label) { + Objects.requireNonNull(label); this.label = label; } @@ -148,6 +155,7 @@ public class ContentType extends CcmObject implements Serializable { } public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; } diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java b/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java index 8c9d8bac8..026d73bad 100644 --- a/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java +++ b/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java @@ -93,6 +93,7 @@ public class Article extends ContentItem implements Serializable { } public void setText(final LocalizedString text) { + Objects.requireNonNull(text); this.text = text; } diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/Event.java b/ccm-cms/src/main/java/org/librecms/contenttypes/Event.java index 3c2e94091..765da87d2 100644 --- a/ccm-cms/src/main/java/org/librecms/contenttypes/Event.java +++ b/ccm-cms/src/main/java/org/librecms/contenttypes/Event.java @@ -169,11 +169,21 @@ public class Event extends ContentItem implements Serializable { )) private LocalizedString cost; + public Event() { + text = new LocalizedString(); + eventDate = new LocalizedString(); + location = new LocalizedString(); + mainContributor = new LocalizedString(); + eventType = new LocalizedString(); + cost = new LocalizedString(); + } + public LocalizedString getText() { return text; } public void setText(final LocalizedString text) { + Objects.requireNonNull(text); this.text = text; } @@ -214,6 +224,7 @@ public class Event extends ContentItem implements Serializable { } public void setEventDate(final LocalizedString eventDate) { + Objects.requireNonNull(eventDate); this.eventDate = eventDate; } @@ -222,6 +233,7 @@ public class Event extends ContentItem implements Serializable { } public void setLocation(final LocalizedString location) { + Objects.requireNonNull(location); this.location = location; } @@ -230,6 +242,7 @@ public class Event extends ContentItem implements Serializable { } public void setMainContributor(final LocalizedString mainContributor) { + Objects.requireNonNull(mainContributor); this.mainContributor = mainContributor; } @@ -238,6 +251,7 @@ public class Event extends ContentItem implements Serializable { } public void setEventType(final LocalizedString eventType) { + Objects.requireNonNull(eventType); this.eventType = eventType; } @@ -254,6 +268,7 @@ public class Event extends ContentItem implements Serializable { } public void setCost(final LocalizedString cost) { + Objects.requireNonNull(cost); this.cost = cost; } diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticle.java b/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticle.java index 6771fa08b..91a1322d8 100644 --- a/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticle.java +++ b/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticle.java @@ -94,6 +94,8 @@ public class MultiPartArticle extends ContentItem implements Serializable { private List sections; public MultiPartArticle() { + super(); + summary = new LocalizedString(); this.sections = new ArrayList<>(); } @@ -102,6 +104,7 @@ public class MultiPartArticle extends ContentItem implements Serializable { } public void setSummary(final LocalizedString summary) { + Objects.requireNonNull(summary); this.summary = summary; } diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleSection.java b/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleSection.java index f7512b853..226887db5 100644 --- a/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleSection.java +++ b/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleSection.java @@ -93,6 +93,12 @@ public class MultiPartArticleSection implements Serializable { )) private LocalizedString text; + public MultiPartArticleSection() { + super(); + title = new LocalizedString(); + text = new LocalizedString(); + } + public long getSectionId() { return sectionId; } @@ -106,6 +112,7 @@ public class MultiPartArticleSection implements Serializable { } public void setTitle(final LocalizedString title) { + Objects.requireNonNull(title); this.title = title; } @@ -130,6 +137,7 @@ public class MultiPartArticleSection implements Serializable { } public void setText(final LocalizedString text) { + Objects.requireNonNull(text); this.text = text; } diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/News.java b/ccm-cms/src/main/java/org/librecms/contenttypes/News.java index d6125acb9..c2175dd48 100644 --- a/ccm-cms/src/main/java/org/librecms/contenttypes/News.java +++ b/ccm-cms/src/main/java/org/librecms/contenttypes/News.java @@ -106,11 +106,17 @@ public class News extends ContentItem implements Serializable { @Column(name = "HOMEPAGE") private boolean homepage; + public News() { + super(); + text = new LocalizedString(); + } + public LocalizedString getText() { return text; } public void setText(final LocalizedString text) { + Objects.requireNonNull(text); this.text = text; } diff --git a/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleDefinition.java b/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleDefinition.java index 35c931de6..aab6c057f 100644 --- a/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleDefinition.java +++ b/ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleDefinition.java @@ -101,6 +101,7 @@ public class LifecycleDefinition implements Serializable { } public void setLabel(final LocalizedString label) { + Objects.requireNonNull(label); this.label = label; } @@ -109,6 +110,7 @@ public class LifecycleDefinition implements Serializable { } public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; } diff --git a/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseDefinition.java b/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseDefinition.java index da44cc92c..0bb915e8e 100644 --- a/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseDefinition.java +++ b/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseDefinition.java @@ -98,6 +98,7 @@ public class PhaseDefinition implements Serializable { } public void setLabel(final LocalizedString label) { + Objects.requireNonNull(label); this.label = label; } @@ -106,6 +107,7 @@ public class PhaseDefinition implements Serializable { } public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; } diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Category.java b/ccm-core/src/main/java/org/libreccm/categorization/Category.java index a1d52b722..4cb7701b1 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/Category.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/Category.java @@ -288,6 +288,7 @@ public class Category extends CcmObject implements Serializable, Portable { } public void setTitle(final LocalizedString title) { + Objects.requireNonNull(title); this.title = title; } @@ -296,6 +297,7 @@ public class Category extends CcmObject implements Serializable, Portable { } public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; } diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Domain.java b/ccm-core/src/main/java/org/libreccm/categorization/Domain.java index 37b00a0cc..45d47c6b7 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/Domain.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/Domain.java @@ -229,6 +229,7 @@ public class Domain extends CcmObject implements Serializable { } public void setTitle(final LocalizedString title) { + Objects.requireNonNull(title); this.title = title; } @@ -237,6 +238,7 @@ public class Domain extends CcmObject implements Serializable { } public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; } diff --git a/ccm-core/src/main/java/org/libreccm/configuration/LocalizedStringSetting.java b/ccm-core/src/main/java/org/libreccm/configuration/LocalizedStringSetting.java index 476538178..ca3bd399a 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/LocalizedStringSetting.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/LocalizedStringSetting.java @@ -65,6 +65,7 @@ public class LocalizedStringSetting @Override public void setValue(final LocalizedString value) { + Objects.requireNonNull(value); this.value = value; } diff --git a/ccm-core/src/main/java/org/libreccm/core/Resource.java b/ccm-core/src/main/java/org/libreccm/core/Resource.java index 161645f43..810030288 100644 --- a/ccm-core/src/main/java/org/libreccm/core/Resource.java +++ b/ccm-core/src/main/java/org/libreccm/core/Resource.java @@ -115,13 +115,12 @@ public class Resource extends CcmObject implements Serializable { childs = new ArrayList<>(); } -// @Column(name = "resource_type") -// private String resourceType; public LocalizedString getTitle() { return title; } public void setTitle(final LocalizedString title) { + Objects.requireNonNull(title); this.title = title; } @@ -130,6 +129,7 @@ public class Resource extends CcmObject implements Serializable { } public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; } diff --git a/ccm-core/src/main/java/org/libreccm/core/ResourceType.java b/ccm-core/src/main/java/org/libreccm/core/ResourceType.java index fa44d6227..e17cafe69 100644 --- a/ccm-core/src/main/java/org/libreccm/core/ResourceType.java +++ b/ccm-core/src/main/java/org/libreccm/core/ResourceType.java @@ -114,6 +114,7 @@ public class ResourceType implements Serializable { } public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; } diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/PersistentDataQuery.java b/ccm-core/src/main/java/org/libreccm/formbuilder/PersistentDataQuery.java index 1219e0f7c..644aa00f4 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/PersistentDataQuery.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/PersistentDataQuery.java @@ -65,6 +65,12 @@ public class PersistentDataQuery extends CcmObject implements Serializable { @JoinColumn(name = "DATA_QUERY_ID")})) private LocalizedString description; + public PersistentDataQuery() { + super(); + name = new LocalizedString(); + description = new LocalizedString(); + } + public String getQueryId() { return queryId; } @@ -78,6 +84,7 @@ public class PersistentDataQuery extends CcmObject implements Serializable { } public void setName(final LocalizedString name) { + Objects.requireNonNull(name); this.name = name; } @@ -86,6 +93,7 @@ public class PersistentDataQuery extends CcmObject implements Serializable { } public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; } diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/ProcessListener.java b/ccm-core/src/main/java/org/libreccm/formbuilder/ProcessListener.java index 070fbc110..d49c42929 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/ProcessListener.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/ProcessListener.java @@ -73,11 +73,18 @@ public class ProcessListener extends CcmObject implements Serializable { @Column(name = "PROCESS_LISTENER_ORDER") private long order; + public ProcessListener() { + super(); + name = new LocalizedString(); + description = new LocalizedString(); + } + public LocalizedString getName() { return name; } public void setName(final LocalizedString name) { + Objects.requireNonNull(name); this.name = name; } @@ -86,6 +93,7 @@ public class ProcessListener extends CcmObject implements Serializable { } public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; } diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java index df3c560ba..6787109db 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java @@ -62,51 +62,51 @@ import javax.validation.constraints.NotNull; @Table(name = "PAGE_MODELS", schema = CoreConstants.DB_SCHEMA) @NamedQueries({ @NamedQuery( - name = "PageModel.findDraftVersion", - query = "SELECT p FROM PageModel p " - + "WHERE p.modelUuid = :uuid " - + "AND p.version = org.libreccm.pagemodel.PageModelVersion.DRAFT") + name = "PageModel.findDraftVersion", + query = "SELECT p FROM PageModel p " + + "WHERE p.modelUuid = :uuid " + + "AND p.version = org.libreccm.pagemodel.PageModelVersion.DRAFT") , @NamedQuery( - name = "PageModel.hasLiveVersion", - query = "SELECT (CASE WHEN COUNT(p) > 0 THEN true ELSE False END) " - + "FROM PageModel p " - + "WHERE p.modelUuid = :uuid " - + "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE" + name = "PageModel.hasLiveVersion", + query = "SELECT (CASE WHEN COUNT(p) > 0 THEN true ELSE False END) " + + "FROM PageModel p " + + "WHERE p.modelUuid = :uuid " + + "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE" ) , @NamedQuery( - name = "PageModel.findLiveVersion", - query = "SELECT p FROM PageModel p " - + "WHERE p.modelUuid = :uuid " - + "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE") + name = "PageModel.findLiveVersion", + query = "SELECT p FROM PageModel p " + + "WHERE p.modelUuid = :uuid " + + "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE") , @NamedQuery( - name = "PageModel.findByApplication", - query = "SELECT p FROM PageModel p " - + "WHERE p.application = :application " - + "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE") + name = "PageModel.findByApplication", + query = "SELECT p FROM PageModel p " + + "WHERE p.application = :application " + + "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE") , @NamedQuery( - name = "PageModel.countByApplication", - query = "SELECT COUNT(p) FROM PageModel p " - + "WHERE p.application = :application " - + "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE") + name = "PageModel.countByApplication", + query = "SELECT COUNT(p) FROM PageModel p " + + "WHERE p.application = :application " + + "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE") , @NamedQuery( - name = "PageModel.findByApplicationAndName", - query = "SELECT p FROM PageModel p " - + "WHERE p.name = :name " - + "AND p.application = :application " - + "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE" + name = "PageModel.findByApplicationAndName", + query = "SELECT p FROM PageModel p " + + "WHERE p.name = :name " + + "AND p.application = :application " + + "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE" ) , @NamedQuery( - name = "PageModel.countByApplicationAndName", - query = "SELECT COUNT(p) FROM PageModel p " - + "WHERE p.name = :name " - + "AND p.application = :application " - + "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE" + name = "PageModel.countByApplicationAndName", + query = "SELECT COUNT(p) FROM PageModel p " + + "WHERE p.name = :name " + + "AND p.application = :application " + + "AND p.version = org.libreccm.pagemodel.PageModelVersion.LIVE" ) }) public class PageModel implements Serializable { @@ -156,12 +156,12 @@ public class PageModel implements Serializable { */ @Embedded @AssociationOverride( - name = "values", - joinTable = @JoinTable(name = "PAGE_MODEL_TITLES", - schema = CoreConstants.DB_SCHEMA, - joinColumns = { - @JoinColumn(name = "PAGE_MODEL_ID") - })) + name = "values", + joinTable = @JoinTable(name = "PAGE_MODEL_TITLES", + schema = CoreConstants.DB_SCHEMA, + joinColumns = { + @JoinColumn(name = "PAGE_MODEL_ID") + })) private LocalizedString title; /** @@ -169,12 +169,12 @@ public class PageModel implements Serializable { */ @Embedded @AssociationOverride( - name = "values", - joinTable = @JoinTable(name = "PAGE_MODEL_DESCRIPTIONS", - schema = CoreConstants.DB_SCHEMA, - joinColumns = { - @JoinColumn(name = "PAGE_MODEL_ID") - })) + name = "values", + joinTable = @JoinTable(name = "PAGE_MODEL_DESCRIPTIONS", + schema = CoreConstants.DB_SCHEMA, + joinColumns = { + @JoinColumn(name = "PAGE_MODEL_ID") + })) private LocalizedString description; /** @@ -247,6 +247,7 @@ public class PageModel implements Serializable { } protected void setTitle(final LocalizedString title) { + Objects.requireNonNull(title); this.title = title; } @@ -255,6 +256,7 @@ public class PageModel implements Serializable { } protected void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; } @@ -350,13 +352,13 @@ public class PageModel implements Serializable { public String toString(final String data) { return String.format("%s{ " - + "pageModelId = %d, " - + "uuid = %s, " - + "name = \"%s\", " - + "title = %s, " - + "description = %s, " - + "type = \"%s\"" - + " }", + + "pageModelId = %d, " + + "uuid = %s, " + + "name = \"%s\", " + + "title = %s, " + + "description = %s, " + + "type = \"%s\"" + + " }", super.toString(), pageModelId, uuid, diff --git a/ccm-core/src/main/java/org/libreccm/security/Role.java b/ccm-core/src/main/java/org/libreccm/security/Role.java index de198e4d4..b7a1376d1 100644 --- a/ccm-core/src/main/java/org/libreccm/security/Role.java +++ b/ccm-core/src/main/java/org/libreccm/security/Role.java @@ -286,14 +286,15 @@ public class Role implements Serializable, Portable { assignedTasks.remove(taskAssignment); } - public void setDescription(final LocalizedString description) { - this.description = description; - } - public LocalizedString getDescription() { return this.description; } + public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); + this.description = description; + } + @Override public int hashCode() { int hash = 7; @@ -319,7 +320,7 @@ public class Role implements Serializable, Portable { if (roleId != other.getRoleId()) { return false; } - + return Objects.equals(name, other.getName()); // if (!Objects.equals(name, other.getName())) { // return false; diff --git a/ccm-core/src/main/java/org/libreccm/workflow/Task.java b/ccm-core/src/main/java/org/libreccm/workflow/Task.java index 68c18ad3c..8c5fb9c7a 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/Task.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/Task.java @@ -230,6 +230,7 @@ public class Task implements Identifiable, Serializable { } public void setLabel(final LocalizedString label) { + Objects.requireNonNull(label); this.label = label; } @@ -238,6 +239,7 @@ public class Task implements Identifiable, Serializable { } public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; } diff --git a/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java b/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java index 1e2329325..bc740168f 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java @@ -112,7 +112,7 @@ public class Workflow implements Identifiable, Serializable, Portable { schema = DB_SCHEMA, joinColumns = { @JoinColumn(name = "WORKFLOW_ID")})) - private LocalizedString name; + private LocalizedString name = new LocalizedString(); /** * Description of the workflow. @@ -125,7 +125,7 @@ public class Workflow implements Identifiable, Serializable, Portable { joinColumns = { @JoinColumn(name = "WORKFLOW_ID") })) - private LocalizedString description; + private LocalizedString description = new LocalizedString(); /** * The current state of the workflow. @@ -201,6 +201,7 @@ public class Workflow implements Identifiable, Serializable, Portable { } public void setName(final LocalizedString name) { + Objects.requireNonNull(name); this.name = name; } @@ -209,6 +210,7 @@ public class Workflow implements Identifiable, Serializable, Portable { } public void setDescription(final LocalizedString description) { + Objects.requireNonNull(description); this.description = description; }