Commit Graph

806 Commits

Author SHA1 Message Date
Tom Page
0393f338ec Merge branch 'feature/TimeZoneFixUnitTest_no' into 'master'
Revert changes to getStartOfDay.

See merge request records-management/records-management!780
2018-01-19 08:14:25 +00:00
Sara Aspery
55472663ba Merge branch 'feature/RM-5927_v20PatchesRunWhenV22Upgrade' into 'master'
RM-5927 Add appliesToVersion to v20 v21 patches

See merge request records-management/records-management!764
2018-01-18 15:36:41 +00:00
Tom Page
0a54487bcf Revert changes to getStartOfDay.
Sonar suggested using the Java 8 method Instant.truncatedTo, as it is faster than
DateUtils.truncate. However it has different handling of TimeZones, and the old
version of this code only works when the server is set to use UTC. In order to fix
this 'properly' we need code like:
  date = (date == null ? new Date() : date);
  return Date.from(date.toInstant().atZone(ZoneId.systemDefault()).truncatedTo(ChronoUnit.DAYS).toInstant());
which is significantly less readable than just using DateUtils.truncate. Given that
this code hasn't ever been highlighted by our profiling, I suggest we revert back
to the older code.
2018-01-18 16:13:20 +01:00
Sara Aspery
16d7e961de RM-5927 Changes from review 2018-01-18 11:41:02 +00:00
Sara Aspery
b1c33ab9a4 RM-5927 Check installed vs current version 2018-01-18 02:58:38 +00:00
Sara Aspery
1d144c612b RM-5927 Check version nbrs and remove appliesTo 2018-01-17 06:47:24 +00:00
Tom Page
0268299006 Updating license header to 2018 2018-01-16 12:31:06 +00:00
Tom Page
4987e1ca40 Updating license header to 2018 2018-01-16 12:26:10 +00:00
Tom Page
350a198837 Updating license header to 2018 2018-01-16 12:21:10 +00:00
Tom Page
9becfe79a5 Add debug log message if exceptions are swallowed.
Fix a couple of minor issues in DynamicAuthoritiesGet webscript.
2018-01-12 15:25:56 +00:00
Tom Page
db4871fd8d Replace a few RuntimeExceptions with AlfrescoRuntimeExceptions. 2018-01-12 14:54:51 +00:00
Tom Page
20edcae7c4 A couple of minor fixes.
Fix method signature to refer to the precise exception thrown.

Use Instant from Java 8 rather than DateUtils.truncate.
2018-01-12 14:13:05 +00:00
Tom Page
be45b4ba37 Simplify inequality check as suggested in code review. 2018-01-08 08:34:42 +00:00
Tom Page
dbc57451ed Fix some issues raised by Sonar.
Avoid NPE if calculateListOfEmptyFolders returns null in ScheduleXRecordLoaders.

Fix equals method of a few classes to check against the other instance.

Make synchonisation consistent in AppliedSourceServiceImpl and also remove a
redundant null check.

Use Arrays.toString to make a more readable string representation of an array.

Combine a few if statement branches that do the same thing.
2018-01-05 16:19:33 +00:00
Tom Page
d46ff0b2dd Merge branch 'feature/RM-5344_DODAuditQuery_fp' into 'master'
RM-5344 Only gather DOD audit entries if there is a DOD RM site.

See merge request records-management/records-management!759
2018-01-05 08:19:57 +00:00
Tom Page
77b5d35685 RM-5344 Handle case where site with id "rm" doesn't exist.
This is not possible normally, but it does happen with the integration tests.

Also fix some whitespace in the test class.
2018-01-04 14:38:57 +00:00
Tom Page
29e00d1ec2 RM-5344 Only gather DOD audit entries if there is a DOD RM site.
This creates an edge case where DOD audit entries are no longer displayed
if a DOD RM site is deleted and then a standard RM site is created to
replace it. However this seems like an unlikely use case, and there is a
workaround of exporting the audit log before deleting the DOD RM site.

Two audit queries are still made for DOD RM sites because DOD sites cause
some standard audit entries to be created (e.g. the holds container
created event, etc.).
2018-01-04 12:08:01 +00:00
Elena Hardon
1cb87e7d6c Merge branch 'master' into feature/RM-5225_AppendUniqueIdToRecordOnCopyToAction_fp 2018-01-03 12:13:53 +02:00
Ana Manolache
f908442af2 update headers to 2018 2018-01-03 12:01:00 +02:00
Elena Hardon
5fd6602038 RM-5970 - Removed onCopyComplete method from RecordComponentIdentifierAspect because it was overwriting the existing unique id for a record on copy to action 2017-12-21 10:58:30 +02:00
Tom Page
a0e770052b Merge release/V2.6 into master. 2017-12-19 10:27:34 +00:00
Tom Page
01961c2382 Merge release/V2.5 into release/V2.6. 2017-12-19 10:26:22 +00:00
Tom Page
ebfee294df Merge release/V2.5.2.x into release/V2.5. 2017-12-19 10:20:48 +00:00
Ross Gale
88ac5834c9 Merge branch 'release/V2.6' into merge/2.3.2 2017-12-11 15:19:33 +00:00
Ross Gale
b0cc81fc2c Merge branch 'release/V2.5' into merge-2.6 2017-12-11 10:49:30 +00:00
Sara Aspery
defcb53c70 MNT-18771 Publish Job Upgrade Error 2017-12-08 22:10:16 +00:00
Ross Gale
24f6fedc24 RM-5883 adding updated schema number to ensure patch runs in later upgrades, including break command to ensure patch will only run once 2017-12-08 14:49:47 +00:00
Ana Bozianu
3c72bbc0f9 MNT-18502 - filtered out dod properties if the node is not a dod record 2017-12-08 07:53:22 +00:00
Ross Gale
ea4b979a5f Merge branch 'release/V2.4' into merge2.5 2017-12-06 11:29:10 +00:00
Ross Gale
c8932192f9 RM-5878 mnt changes added to a 2.4 branch 2017-12-05 16:21:07 +00:00
Ana Bozianu
a36e1773af Merge remote-tracking branch 'origin/merge-2.6/MNT-18793' into merge/MNT-18793 2017-11-27 15:17:16 +02:00
Ana Bozianu
915e99394c Merge remote-tracking branch 'origin/merge-2.5/MNT-18793_to_2.5.x' into merge-2.6/MNT-18793 2017-11-27 15:15:03 +02:00
Ana Bozianu
4fcfdb164e Merge MNT-18793 from release/V2.5.0.x into release/V2.5 2017-11-27 15:09:13 +02:00
Ana Bozianu
33af594d47 MNT-18793 - added paginated navigation in the disposition action executer 2017-11-24 14:27:03 +00:00
Rodica Sutu
8765349a80 Merge remote-tracking branch 'remotes/origin/hotfix-2.5/MNT-18793_EligibleActionsNotExecuted' into merge-2.5/MNT-18793_to_2.5.x 2017-11-24 09:51:59 +02:00
Ana Bozianu
75469a0f5b MNT-18793 - added paginated navigation in the disposition action executer 2017-11-23 22:21:51 +02:00
Sara Aspery
dd89c7d2f2 RM-5901 fixes in benchmark driver 2017-11-16 18:15:59 +00:00
Roxana Lucanu-Ghetu
d0b96f58ab RM-5839 Fixed permission denied error and added integration test for the fix. 2017-11-13 10:57:12 +02:00
Roxana Lucanu-Ghetu
3747970225 RM-5844 Fix permission error. 2017-11-09 11:00:26 +02:00
Ana Bozianu
e6a54af4a7 RM-5617 - added integration test and fixed small issues discovered in the process 2017-10-24 17:30:39 +03:00
Ana Bozianu
41311ef40b Feature/rm 5655 classification beyond highest child 2017-09-29 11:39:00 +01:00
Ramona Popa
0917a23dee Feature/rm 4729 declassification timeframe rest api 2017-08-22 09:19:03 +01:00
Tuna Aksoy
642e8b2ac8 Merge remote-tracking branch 'origin/feature/RM-4717_ClassificationReasonsJavaApiTests' into feature/RM-4707_Classification_Reason_CRUD_REST_API
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationReasonsTest.java
2017-08-04 15:09:02 +01:00
Ana Bozianu
bae4d0c394 RM-4717 - tests, one failing 2017-08-03 20:28:13 +03:00
Tom Page
277d9aabbd RM-5481 Handle empty string as a reason or exemption id.
If the empty string is passed as a classification reason or exemption id then the API framework
converts it to null for us. We should throw a 404 (not found) error, because there are no reasons
or exemptions with the empty string as their id (or null for that matter).  Add two new REST API
tests for these cases.

Also stopped using the helper method addParam in TopicsWithInstructionsTest, as it is only saving us
about ten characters, causes an extra import and includes an explicit mention of the topicsApi
inside it (i.e. it doesn't work at all with the guidesAPI).
2017-08-03 13:10:37 +01:00
Tom Page
88a3c42750 RM-5309 Merge release/V2.5 into master. 2017-07-24 18:49:10 +01:00
Tom Page
7e1b33dad7 MNT-18083 Merge release/V2.5 into master. 2017-07-24 18:45:44 +01:00
Tom Page
cb31194cb1 RM-5420 Code review fixes including move toIndentedString into a helper method. 2017-07-24 15:53:35 +01:00
Ramona Popa
1eb4e09a83 RM-5309 - added behaviour bean for qshare:shared aspect and integration test 2017-07-20 11:48:10 +03:00
Tom Page
a473316d3d Merge branch 'merge-2.5/MNT-18083_SearchPerformance' into 'release/V2.5'
Merge 2.5/mnt 18083 search performance

See merge request !373
2017-07-19 08:39:44 +01:00