Commit Graph

6147 Commits

Author SHA1 Message Date
Rodica Sutu
8ab3078bba fix sonar final warning 2019-07-05 12:50:19 +03:00
cagache
5a30bb57d1 transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance
(cherry picked from commit e8725860eb)

# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/classification/content/SetRMExemptionReasonTest.java
2019-07-05 10:32:10 +03:00
Rodica Sutu
ab6a5dbe02 Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3-0/RM-6577_AutomatedRestApiTests 2019-07-04 17:59:38 +03:00
cagache
0b765199fe Merge IE changes from release/V3.0 branch to release/V3.1 branch 2019-07-04 17:11:45 +03:00
Rodica Sutu
c6b87beb6a Merge branch 'feature-3.0/RM-6565_UpdateDockerComposeWithIE' into 'release/V3.0'
feature-3.0/RM-6565_UpdateDockerComposeWithIE

See merge request records-management/records-management!1197
2019-07-04 14:50:17 +01:00
Rodica Sutu
f0cac1040c Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3.0/RM-6565_UpdateDockerComposeWithIE 2019-07-04 16:18:25 +03:00
Claudia Agache
9cea9be8a2 Merge branch 'feature-3.0/RM-6564_IE_DevelopmentTask' into 'release/V3.0'
RM-6564 IE development task

See merge request records-management/records-management!1198
2019-07-04 14:04:32 +01:00
cagache
a976789861 transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance
(cherry picked from commit a54a80f6a6)

# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMUserAPI.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/base/BaseRMEnterpriseRestTest.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/classification/folder/RecordFolderClassificationTest.java
2019-07-04 16:03:20 +03:00
cagache
4de260d588 Back-port fix from MNT-19967 2019-07-04 15:29:51 +03:00
cagache
fc4f1b77c4 Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge/RM-6892_SonarFixes 2019-07-04 14:27:07 +03:00
Rodica Sutu
53b843d958 review updates 2019-07-04 13:18:16 +03:00
cagache
91534ac7df code review comments 2019-07-04 11:28:35 +03:00
cagache
ff8816a38e Update branch with latest release/V3.0 changes 2019-07-04 10:01:06 +03:00
cagache
cd76665548 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-6892_SonarFixes 2019-07-04 09:47:50 +03:00
Claudia Agache
b1ac8da7d9 Merge branch 'feature-3.0/RM-6892_SonarFixes' into 'release/V3.0'
RM-6892 More sonar fixes

See merge request records-management/records-management!1203
2019-07-04 07:44:12 +01:00
cagache
7a03c64ffd Merge changes from release/V3.0 branch to release/V3.1 branch 2019-07-04 09:40:11 +03:00
Rodica Sutu
65fd23c294 code review changes 2019-07-03 18:23:45 +03:00
cagache
7a370248a2 Sonar critical bug: inefficient use of keySet iterator instead of entrySet iterator 2019-07-03 17:30:10 +03:00
cagache
d27d927f51 Merge remote-tracking branch 'remotes/origin/release/V3.0' into feature-3.0/RM-6892_SonarFixes 2019-07-03 13:17:03 +03:00
Claudia Agache
96291db607 Merge branch 'feature-3.0/RM-6892_CherryPickSonarChangesFrom3.1' into 'release/V3.0'
RM-6892 Cherry pick Sonar changes from AGS 3.1

See merge request records-management/records-management!1202
2019-07-03 11:08:08 +01:00
cagache
179205ec61 code review comments 2019-07-02 17:34:51 +03:00
Ross Gale
95220d099b RM-6564 adding documentation 2019-07-02 12:21:00 +01:00
cagache
2071139e6e Sonar critical bug: inefficient use of keySet iterator instead of entrySet iterator 2019-07-02 12:06:13 +03:00
Rodica Sutu
041a0ca606 Merge branch 'feature-3.0/RM-6565_UpdateDockerComposeWithIE' of https://git.alfresco.com/records-management/records-management into feature-3-0/RM-6577_AutomatedRestApiTests 2019-07-02 12:04:11 +03:00
Rodica Sutu
ab41b55602 Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3.0/RM-6565_UpdateDockerComposeWithIE 2019-07-02 11:53:47 +03:00
Rodica Sutu
da636f2061 Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3-0/RM-6577_AutomatedRestApiTests 2019-07-02 10:34:50 +03:00
Rodica Sutu
7c323aa809 refactoring of the added rest api tests for SQL queries
new tests added for sql queries for: record categories, record folders and records
2019-07-02 10:29:21 +03:00
cagache
39245d19c8 Removed redundant local variables 2019-07-01 16:45:32 +03:00
cagache
723183021a Removed redundant conditional expression 2019-07-01 16:34:24 +03:00
cagache
c5907dbc10 Removed unnecessary null check before Boolean.parseBoolean 2019-07-01 16:28:48 +03:00
cagache
da33dc1ae1 Removed unnecessary semicolon 2019-07-01 16:19:52 +03:00
cagache
6bc4ec03a6 Sonar code smell: Replace the type specification in this constructor call with the diamond operator ("<>") 2019-07-01 16:01:43 +03:00
cagache
26019f50ea Merge changes from V3.0 branch 2019-07-01 12:12:32 +03:00
Ross Gale
602bcd7c63 Merge branch 'release/V3.0' into feature-3.0/RM-6564_IE_DevelopmentTask 2019-06-26 10:51:42 +01:00
Ross Gale
4cb74ad5b2 Merge branch 'feature-3.0/RM-6746_Java11' into 'release/V3.0'
Resolve RM-6746 "Feature 3.0/ java11"

See merge request records-management/records-management!1201
2019-06-26 08:39:30 +01:00
Ross Gale
4500017453 RM-6746 update from code review 2019-06-25 16:01:53 +01:00
Rodica Sutu
e3614fd3de Merge branch 'feature/RM-6825_IncreaseTravisTimeout' into 'master'
Increase Travis timeout

Closes RM-6825

See merge request records-management/records-management!1162
2019-06-25 16:00:23 +01:00
Ross Gale
a2362ed464 Merge branch 'feature/RM-6825_UpdateTravis' into 'master'
RM-6825 update travis to use openjdk11

Closes RM-6825

See merge request records-management/records-management!1157
2019-06-25 15:59:50 +01:00
Rodica Sutu
0c4b0dc23b test updates: minor refactoring and formatting fixes 2019-06-24 10:16:20 +03:00
cagache
8bac296cff Revert "removed unused variable"
This reverts commit c55c5929
2019-06-21 16:33:08 +03:00
Ross Gale
676e7be940 RM-6831 updating search value
(cherry picked from commit a002f1d1c5)
2019-06-21 16:21:49 +03:00
Ross Gale
5c7e51d8b3 RM-6831 adding sonar fix
(cherry picked from commit 01b4146582)
2019-06-21 16:21:30 +03:00
cagache
1a8ee3d19e fix Sonar: Empty statements should be removed
(cherry picked from commit 365fddc247)
2019-06-21 16:20:35 +03:00
cagache
e0aaea61d2 Fix sonar Performance - Boxed value is unboxed and then immediately reboxed
(cherry picked from commit 7f73ad8227)
2019-06-21 16:16:01 +03:00
cagache
b5d4d79fcb Fix "Either re-interrupt this method or rethrow the "InterruptedException"." sonar bug
(cherry picked from commit 929980e7c2)
2019-06-21 16:14:53 +03:00
cagache
c97adfaac4 delete unnecessary semicolon
(cherry picked from commit 5dcae9c608)
2019-06-21 16:14:30 +03:00
cagache
cc203c0cf2 removed contentService from child classes and made it protected in parent class
(cherry picked from commit 4fa230a322)
2019-06-21 16:12:31 +03:00
cagache
c55c5929fb removed unused variable
(cherry picked from commit ba729a0f2e)
2019-06-21 16:11:11 +03:00
cagache
aceaef2f44 removed contentService from child classes and made it protected in parent class
(cherry picked from commit a11feb9bfe)
2019-06-21 16:10:30 +03:00
Ross Gale
8b949ad483 RM-6836 remove unused imports
(cherry picked from commit 8515b9c2f8)
2019-06-21 16:06:43 +03:00