From 3c1c1a7d0fd9aded8ef985b3be86db4faadc2824 Mon Sep 17 00:00:00 2001 From: Lilian VARREL Date: Thu, 13 Feb 2025 12:39:49 +0100 Subject: [PATCH] Issue 39 - Fix Assert.notNull deprecated usage for compatibility with Spring 6.1 and ACS 23.4 --- .../com/atolcd/alfresco/helper/PermissionsHelper.java | 2 +- .../java/com/atolcd/alfresco/helper/SearchHelper.java | 2 +- .../com/atolcd/alfresco/repo/jscript/ShareStats.java | 10 +++++----- .../web/scripts/shareStats/AuditExportGet.java | 8 ++++---- .../web/scripts/shareStats/DeleteAuditDelete.java | 2 +- .../web/scripts/shareStats/InsertAuditPost.java | 8 ++++---- .../web/scripts/shareStats/SelectAuditsGet.java | 4 ++-- .../web/scripts/shareStats/SelectNodeTypesGet.java | 6 +++--- .../web/scripts/shareStats/SelectUsersGet.java | 8 ++++---- .../web/scripts/shareStats/SelectVolumetryGet.java | 4 ++-- .../web/scripts/shareStats/UpdateAuditPost.java | 8 ++++---- .../repo/jscript/AuditShareScriptExtension.java | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/audit-share-platform/src/main/java/com/atolcd/alfresco/helper/PermissionsHelper.java b/audit-share-platform/src/main/java/com/atolcd/alfresco/helper/PermissionsHelper.java index e289c2bb..62b019de 100644 --- a/audit-share-platform/src/main/java/com/atolcd/alfresco/helper/PermissionsHelper.java +++ b/audit-share-platform/src/main/java/com/atolcd/alfresco/helper/PermissionsHelper.java @@ -52,7 +52,7 @@ public void setAuthorityService(AuthorityService authorityService) { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(siteService); + Assert.notNull(siteService, "[Assertion failed] - this argument is required; it must not be null"); } public static boolean isAuthorized(WebScriptRequest req) { diff --git a/audit-share-platform/src/main/java/com/atolcd/alfresco/helper/SearchHelper.java b/audit-share-platform/src/main/java/com/atolcd/alfresco/helper/SearchHelper.java index 13f74e22..7f5a02b0 100644 --- a/audit-share-platform/src/main/java/com/atolcd/alfresco/helper/SearchHelper.java +++ b/audit-share-platform/src/main/java/com/atolcd/alfresco/helper/SearchHelper.java @@ -36,7 +36,7 @@ public void setSearchService(SearchService searchService) { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(searchService); + Assert.notNull(searchService, "[Assertion failed] - this argument is required; it must not be null"); } /** diff --git a/audit-share-platform/src/main/java/com/atolcd/alfresco/repo/jscript/ShareStats.java b/audit-share-platform/src/main/java/com/atolcd/alfresco/repo/jscript/ShareStats.java index 1824bf13..daf551e8 100644 --- a/audit-share-platform/src/main/java/com/atolcd/alfresco/repo/jscript/ShareStats.java +++ b/audit-share-platform/src/main/java/com/atolcd/alfresco/repo/jscript/ShareStats.java @@ -108,11 +108,11 @@ public void setSqlSessionTemplate(SqlSessionTemplate sqlSessionTemplate) { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(siteService); - Assert.notNull(searchService); - Assert.notNull(wsInsertAudits); - Assert.notNull(auditShareReferentielService); - Assert.notNull(sqlSessionTemplate); + Assert.notNull(siteService, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(searchService, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(wsInsertAudits, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(auditShareReferentielService, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(sqlSessionTemplate, "[Assertion failed] - this argument is required; it must not be null"); } public List getReferentiel(String refGroup) { diff --git a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/AuditExportGet.java b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/AuditExportGet.java index cce972cc..08a572ce 100644 --- a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/AuditExportGet.java +++ b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/AuditExportGet.java @@ -97,10 +97,10 @@ public void setAuditShareReferentielService(AuditShareReferentielService auditSh @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(wsSelectAudits); - Assert.notNull(siteService); - Assert.notNull(auditShareReferentielService); - Assert.notNull(authorityService); + Assert.notNull(wsSelectAudits, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(siteService, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(auditShareReferentielService, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(authorityService, "[Assertion failed] - this argument is required; it must not be null"); } @Override diff --git a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/DeleteAuditDelete.java b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/DeleteAuditDelete.java index a39673cd..856be000 100644 --- a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/DeleteAuditDelete.java +++ b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/DeleteAuditDelete.java @@ -52,7 +52,7 @@ public void setSqlSessionTemplate(SqlSessionTemplate sqlSessionTemplate) { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(sqlSessionTemplate); + Assert.notNull(sqlSessionTemplate, "[Assertion failed] - this argument is required; it must not be null"); } @Override diff --git a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/InsertAuditPost.java b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/InsertAuditPost.java index 79acc403..0924e5ec 100644 --- a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/InsertAuditPost.java +++ b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/InsertAuditPost.java @@ -80,10 +80,10 @@ public void setNamespaceService(NamespaceService namespaceService) { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(this.sqlSessionTemplate); - Assert.notNull(this.nodeService); - Assert.notNull(this.siteService); - Assert.notNull(this.namespaceService); + Assert.notNull(this.sqlSessionTemplate, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(this.nodeService, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(this.siteService, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(this.namespaceService, "[Assertion failed] - this argument is required; it must not be null"); } @Override diff --git a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectAuditsGet.java b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectAuditsGet.java index 39f31c20..511297d6 100644 --- a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectAuditsGet.java +++ b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectAuditsGet.java @@ -101,8 +101,8 @@ public void setLimitMostReadOrUpdate(int limitMostReadOrUpdate) { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(this.sqlSessionTemplate); - Assert.notNull(this.nodeService); + Assert.notNull(this.sqlSessionTemplate, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(this.nodeService, "[Assertion failed] - this argument is required; it must not be null"); } @Override diff --git a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectNodeTypesGet.java b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectNodeTypesGet.java index 4e88e358..3388c845 100644 --- a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectNodeTypesGet.java +++ b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectNodeTypesGet.java @@ -67,9 +67,9 @@ public void setDictionaryService(DictionaryService dictionaryService) { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(this.sqlSessionTemplate); - Assert.notNull(this.namespaceService); - Assert.notNull(this.dictionaryService); + Assert.notNull(this.sqlSessionTemplate, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(this.namespaceService, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(this.dictionaryService, "[Assertion failed] - this argument is required; it must not be null"); } @Override diff --git a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectUsersGet.java b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectUsersGet.java index dc347642..b45e1e0c 100644 --- a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectUsersGet.java +++ b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectUsersGet.java @@ -80,10 +80,10 @@ public void setAuthorityService(AuthorityService authorityService) { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(this.sqlSessionTemplate); - Assert.notNull(this.nodeService); - Assert.notNull(this.siteService); - Assert.notNull(this.authorityService); + Assert.notNull(this.sqlSessionTemplate, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(this.nodeService, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(this.siteService, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(this.authorityService, "[Assertion failed] - this argument is required; it must not be null"); } @Override diff --git a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectVolumetryGet.java b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectVolumetryGet.java index a0dd05ec..92197e94 100644 --- a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectVolumetryGet.java +++ b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectVolumetryGet.java @@ -61,8 +61,8 @@ public void setSiteService(SiteService siteService) { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(sqlSessionTemplate); - Assert.notNull(siteService); + Assert.notNull(sqlSessionTemplate, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(siteService, "[Assertion failed] - this argument is required; it must not be null"); } protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { diff --git a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/UpdateAuditPost.java b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/UpdateAuditPost.java index 2855b800..da81eb1c 100644 --- a/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/UpdateAuditPost.java +++ b/audit-share-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/UpdateAuditPost.java @@ -71,10 +71,10 @@ public void setWsSelectAudits(SelectAuditsGet wsSelectAudits) { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(this.sqlSessionTemplate); - Assert.notNull(this.nodeService); - Assert.notNull(this.siteService); - Assert.notNull(this.wsSelectAudits); + Assert.notNull(this.sqlSessionTemplate, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(this.nodeService, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(this.siteService, "[Assertion failed] - this argument is required; it must not be null"); + Assert.notNull(this.wsSelectAudits, "[Assertion failed] - this argument is required; it must not be null"); } @Override diff --git a/audit-share-share/src/main/java/com/atolcd/auditshare/repo/jscript/AuditShareScriptExtension.java b/audit-share-share/src/main/java/com/atolcd/auditshare/repo/jscript/AuditShareScriptExtension.java index 0017e591..52111e65 100644 --- a/audit-share-share/src/main/java/com/atolcd/auditshare/repo/jscript/AuditShareScriptExtension.java +++ b/audit-share-share/src/main/java/com/atolcd/auditshare/repo/jscript/AuditShareScriptExtension.java @@ -65,7 +65,7 @@ public void setSlingshotEvaluatorUtil(SlingshotEvaluatorUtil slingshotExtensibil @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(util); + Assert.notNull(util, "[Assertion failed] - this argument is required; it must not be null"); } public boolean isMemberOfGroups(String groupIds) {