Commit Graph

8408 Commits

Author SHA1 Message Date
fe61781889 Merge pull request #6358 from corda/adel/merge-4.3-to-4.4-17June
Merge OS 4.3 to OS 4.4
2020-06-17 18:13:55 +01:00
d0c0a1d9ba ENT-5430: Fix deserialisation of commands containing generic types. (#6359) 2020-06-17 17:28:26 +01:00
debc962d1d Merge remote-tracking branch 'origin/release/os/4.3' into adel/merge-4.3-to-4.4-17June 2020-06-17 10:06:34 +01:00
2b7c220522 INFRA-387 preallocation and deployNodes migration to Code Checks (#6339)
* preallocate for slow integration tests as well
2020-06-12 15:30:15 +01:00
d7e55ed4e5 CORDA-3837: When delivering a lifecycle event, copy the database context into the lifecycle event thread (#6331) 2020-06-11 11:14:51 +01:00
cf8cd8e004 INFRA-348 JDK 11 Compatibility job migration (#6311) 2020-06-05 15:20:03 +01:00
6ab6099075 [INFRA-368] Add deployNodes and install gradle tasks (#6302) 2020-06-03 14:05:12 +01:00
a9b8751ce7 [INFRA-351] Jenkinsfile for code check jobs (#6294) 2020-05-29 13:08:00 +01:00
ef3270e32c [INFRA-352] Artifactory publication in Jenkins (#6276) (#6290)
* [INFRA-352] Artifactory publication in Jenkins

* Address review comments
2020-05-28 22:34:37 +01:00
a33309a31b CORDA-3755: Backport AttachmentURLStreamHandlerFactory memory leak (#6274)
* CORDA-3755: Switched attachments map to a WeakHashMap (#6214)

* CORDA-3772: Now specify source and target of 8 when compiling contract classes.

* CORDA-3651: addManifest now uses separate files for reading and writing. (#6026)

* CORDA-3651: addManifest now uses separate files for reading and writing.

* CORDA-3651: The jar scanning loader now closes itsself.

Co-authored-by: Adel El-Beik <adelel-beik@19LDN-MAC108.local>

Co-authored-by: Adel El-Beik <adelel-beik@19LDN-MAC108.local>
2020-05-27 11:35:15 +01:00
ad40b6618d Merge pull request #6281 from corda/nnagy-os-4.3-os-4.4-20200522
Nnagy os 4.3 os 4.4 20200522
2020-05-22 17:27:06 +01:00
61d9dd0bb1 Merge branch 'release/os/4.3' into nnagy-os-4.3-os-4.4-20200522 2020-05-22 15:33:58 +01:00
8e74eea607 CORDA-3587 - adding kdocs for current behaviour of VaultQueryCriteria (#6242)
* adding kdocs for current behaviour of VaultQueryCriteria

* improving the kdocs

* address PR comments
2020-05-21 13:26:55 +01:00
cc8ce3ca99 empty list checks (#6262) 2020-05-19 14:04:19 +01:00
350066d386 fix for handling empty lists in vault query (#6231) 2020-05-11 15:41:50 +01:00
b6dc1d8c4a NOTICK - Reduce flow count for test to improve run time (#6213) 2020-05-05 09:38:55 +01:00
cfb985244a Merge pull request #6211 from corda/CORDA-3662-backport-from-4.5
ENT-5263: Backport CORDA-3662: Use an INNER JOIN for network map cache queries
2020-05-04 16:15:14 +01:00
55797612b2 ENT-5237: Remove DISTINCT (backport) 2020-05-04 15:02:33 +01:00
ebdd40049c CORDA-3662: Use an INNER JOIN for network map cache queries, (#6062)
- rename add or update function for clarity
- put removal of old nodes after retrieval of new ones to avoid gaps in the map
- plus add a test
2020-05-04 11:10:21 +01:00
8eda8b744f Merge pull request #6181 from corda/nnagy-os-4.3-os-4.4-20200423
Nnagy os 4.3 os 4.4 20200423
2020-04-24 15:00:34 +01:00
335372cfc1 Merge branch 'release/os/4.3' into nnagy-os-4.3-os-4.4-20200423 2020-04-23 16:03:17 +01:00
69a4f80cd2 ENT-5141: Fix ConcurrentModificationException in FetchDataFlow (#6176)
* ENT-5141: Fix ConcurrentModificationException in FetchDataFlow

* Make detekt happy

* Make CheckpointSerializationEnvironmentRule inheritable
2020-04-23 13:11:23 +01:00
02d21c7bac making sure hibernate uses UTC time zone (#6168) 2020-04-22 13:34:17 +01:00
7e13491a25 CORDA-3716: Fix Enum serializers to handle enums that override toString()
* CORDA-3716: Fix SandboxEnumSerializer to handle enums that override toString().

* Remove more uses of Enum.toString() from the Corda serializer.

* Add test coverage for this case to standard enum serializer.

* Increase maxWaitTimeout in IRSDemoTest to 150 seconds.
2020-04-20 17:49:12 +01:00
f4c1119727 INFRA-284 switching from local k8s label (#6156) 2020-04-17 15:53:10 +01:00
4210c0d81f INFRA-284 switching from local k8s label (#6157) 2020-04-17 15:52:47 +01:00
032f008e7e CORDA-3688: Apply @Named annotation to CRaSH commands to fix usage messages. (#6126) 2020-04-03 08:35:01 +01:00
b340766506 ENT-5039 Improved help text for commands (#6006) (#6122)
* Improved help text for commands
* Address feedback

Co-authored-by: jakubbielawa <jakub.bielawa@gmail.com>
2020-04-02 17:43:51 +01:00
f1ebaa761b CORDA-3680: Add CorDapp custom serialisers to Driver's in-process nodes. (#6098)
* Run serialisation tests with both in-process and out-of-process nodes.

* Add custom serialisers and whitelists to Driver's AMQPServerSerializationScheme.
2020-03-27 10:01:30 +00:00
a5d49ea111 Merge pull request #6104 from corda/jzd/merge-os4.3-into-os4.4-2020-03-26
[NOTICK] - Merge OS 4.3 into OS 4.4 (2020-03-26)
2020-03-26 14:21:00 +00:00
b766eff284 Merge remote-tracking branch 'origin/release/os/4.3' into jzd/merge-os4.3-into-os4.4-2020-03-26 2020-03-26 11:01:39 +00:00
d77c524381 Merge pull request #6103 from corda/dan/backport-corda-3677
Backport CORDA-3677
2020-03-26 10:48:28 +00:00
f6952963a8 CORDA-3677 FlowExternalOperation serialising reference to FlowLogic (#6094)
* Stop capturing 'FlowLogic' references in flowAsyncOperation;

Creating concrete classes removes the implicit reference to FlowLogic (as this) being included in the anonymous object

* Modify test code so that lambdas no longer get implicit references to their enclosing 'FlowLogic'
2020-03-26 10:00:57 +00:00
2dbf90cafe ENT-4857: Fix race condition in trackTransaction (#6096)
- Fix issue
- Emit warning if we are inside a DB transaction
- Include a path that does not emit warning
- Add unit tests
2020-03-25 11:53:06 +00:00
8f54ef740f Merge pull request #5610 from corda/pb-add-docker-with-debug-tools
Add debug dockerfiles with additional tools useful for investigating …
2020-03-21 23:09:49 +00:00
668748b054 CORDA-3669 Do not execute ExecuteAsyncOperation multiple times (#6087)
* CORDA-3669 Do not execute `ExecuteAsyncOperation` multiple times

When a `FlowExternalOperation` or `FlowExternalAsyncOperation` executes
and completes a flag (`isFlowResumed`) is switched to true.

This flag was used inside of `DoRemainingWorkTransition` to decide
whether to skip over the execution of an event.

Since this flag was being switched to true when the external operation's
 future completed, it was possible for _unexpected_ events to be placed
in the fiber's queue that would retrigger the
`FlowIORequest.ExecuteAsyncOperation`, that is held as the checkpoint's
next `FlowIORequest`to process.

By using the existing `StateMachineState.isTransactionTracked` (and
renaming it to `isWaitingForFuture`) we can decide to not process the
`FlowIORequest.ExecuteAsyncOperation` if it has already been called
before. This moves this code path in line with
`FlowIORequest.WaitForLedgerCommit`.

Random `DoRemainingWork` events can now be pushed to the fiber's queue
without causing the `FlowIORequest.ExecuteAsyncOperation` to execute
again.
2020-03-20 19:02:34 +00:00
861b769499 NOTICK Update release-notes about database transaction limitations (#6052)
* NOTICK Update release-notes about database transaction limitations
2020-03-17 13:55:10 +00:00
f476c1581d CORDA-3377: Upgrade to DJVM 1.0. (#6071) 2020-03-17 08:48:45 +00:00
9495efc50c Updates DJVM docs. (#6043) 2020-03-16 12:27:55 +00:00
8973c5ba96 TM-168 reusable configurations for distributed testing (#6048)
* TM-168 reusable configurations for distributed testing

* TM-168 switching to class

* TM-168 switching to ext properties

* TM-168 large scale set is too aggressive and prone to failure so switching to general purpose
2020-03-12 10:04:22 +00:00
c565d47adc use proxied gradle to prevent slow lorrising due to too many requests (#6056)
* use proxied gradle to prevent slow lorrising  due to too many requests

* fix typo
2020-03-12 08:15:28 +00:00
d61536c6ff OS 4.4 release notes: added warning about integration testing changes (#6025)
* OS 4.4 release notes: added warning about integration testing changes

* OS 4.4 release notes: more datail on integration testing changes
2020-03-11 11:56:46 +00:00
13e54c1346 Merge pull request #6045 from corda/jzd/CORDA-3394-move-unit-test
CORDA-3394: Move the unit test to the correct location
2020-03-09 16:58:36 +00:00
3973fe46f2 Update contributing-philosophy.rst (#6044) 2020-03-09 15:11:53 +00:00
b02768aa6e CORDA-3394: Move unit test to correct location 2020-03-09 15:08:40 +00:00
3a13e8ab31 Merge pull request #6039 from corda/jzd/os4.3-to-os4.4-merge-2020-03-06
OS 4.3 to OS 4.4 merge 2020-03-06
2020-03-06 15:16:02 +00:00
006dde8591 Merge remote-tracking branch 'origin/release/os/4.3' into jzd/os4.3-to-os4.4-merge-2020-03-06 2020-03-06 11:33:26 +00:00
5b50ef49bc CORDA-3651: addManifest now uses separate files for reading and writing. (#6026)
* CORDA-3651: addManifest now uses separate files for reading and writing.

* CORDA-3651: The jar scanning loader now closes itsself.

Co-authored-by: Adel El-Beik <adelel-beik@19LDN-MAC108.local>
2020-03-06 09:14:36 +00:00
e5a8888232 CORDA-3644: Add Corda-Testing tag to test artifacts' MANIFEST.MF. (#6032) 2020-03-05 17:39:55 +00:00
60a74c0399 [NOTICK] The list added for Bugs and Storys without Epic link (#6033)
[NOTICK] The list added for Bugs and Storys without Epic link (#6033)
2020-03-05 16:23:08 +00:00