Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 39 - Fix Assert.notNull deprecated usage for compatibility with Spring 6.1 and ACS 23.4 #40

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue 39 - Fix Assert.notNull deprecated usage for compatibility with Spring 6.1 and ACS 23.4 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion audit-share-platform/src/main/java/com/atolcd/alfresco/helper/PermissionsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion audit-share-platform/src/main/java/com/atolcd/alfresco/helper/SearchHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

/**
Expand Down
10 changes: 5 additions & 5 deletions audit-share-platform/src/main/java/com/atolcd/alfresco/repo/jscript/ShareStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Group> getReferentiel(String refGroup) {
Expand Down
8 changes: 4 additions & 4 deletions ...are-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/AuditExportGet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/DeleteAuditDelete.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ...re-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/InsertAuditPost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...re-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectAuditsGet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectNodeTypesGet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ...are-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectUsersGet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/SelectVolumetryGet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache) {
Expand Down
8 changes: 4 additions & 4 deletions ...re-platform/src/main/java/com/atolcd/alfresco/web/scripts/shareStats/UpdateAuditPost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...are-share/src/main/java/com/atolcd/auditshare/repo/jscript/AuditShareScriptExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down