Commit Graph

9665 Commits

Author SHA1 Message Date
20bd5d9647 Merge pull request #5793 from corda/ramzi/43-44-merge
OS 4.3 -> OS 4.4 Merge
2019-12-09 15:43:32 +00:00
14050826e9 ENT-4595 harmonize core and serialization (#5792)
* Harmonize serialization/core and deterministic counterparts

* Fix test for changed private alias key behaviour

* Detekt errors

* roll back project.xml
2019-12-09 14:17:48 +00:00
74c4bd6a3d Merge remote-tracking branch 'origin/release/os/4.3' into ramzi/43-44-merge 2019-12-09 13:37:50 +00:00
87b39bf515 ENM-866: Link to correct endpoints
ENM-866: Link to correct endpoints
2019-12-05 16:22:55 +00:00
0ca97d2d96 ENM-866: Link to CENM docs 2019-12-05 13:27:52 +00:00
43205e1f1a CORDA-3471: Create CordaTransactionSupport and make it accessible through AppServiceHub (#5768)
* CORDA-3471: Create `CordaTransactionSupport` and use wherever possible instead of `CordaPersistence`

* CORDA-3471: Address comments by @mnesbit
- Relocate `CordaTransactionSupport` to `core`
- Create a lighter version of transaction - `VaultTransaction` that gives access to `session` object only.

* CORDA-3471: More changes after discussion with  @mnesbit
- Rename `VaultTransaction` into `SessionScope`.

* CORDA-3471: Revert changes to most of the files after conversation with @mnesbit and @rick-r3

* CORDA-3471: Introduce `CordaTransactionSupportImpl` and make it accessible via `AppServiceHub`.

* CORDA-3471: Minor change (comment).

* CORDA-3471: Address input from @mnesbit

* CORDA-3471: Address input from @rick-r3

* CORDA-3471: Make Detekt happier

* CORDA-3471: Add a new test that proves transactions can be started from client threads

As requested by @mnesbit

* CORDA-3471: Change log and documentation update.

As requested by @mnesbit
2019-12-04 17:18:40 +00:00
3fc916fb6c Add Allure report generation (#5776)
* Add Allure report generation

* change test artifact path for allure
2019-12-04 14:49:44 +00:00
5a41ec9b82 CORDA-3464: Also scan attachment:// URLs for custom serializers. (#5769)
* CORDA-3464: Also scan attachment:// URLs for custom serializers.

* Only scan the given classloader - ignore this classloader's parents.

* Upgrade to ClassGraph 4.8.58 - for "robustness fixes".

* Register the attachment:// URL scheme using AttachmentsClassLoader.

* Add integration test for custom serializer in contract state.

* Rename Currancy -> Currantsy, just to make the point.
2019-12-03 15:50:21 +00:00
2abf22ccf9 ENT-4513: Add checks for closing the RPC client (#5781) 2019-12-03 11:59:00 +00:00
e6f9b46584 https://r3-cev.atlassian.net/browse/ENT-3829 (#5763)
Open Source
2019-12-03 10:28:00 +00:00
96e6313fbd CORDA-3477: Update node database documentation to be correct (#5782)
* Update node database documentation to be correct

* Couple more discrepancies
2019-12-02 16:37:31 +00:00
ee74963235 Update node.conf template to remove single quotes (#5652)
The single quotes surrounding the jvm arguments in the empty node.conf cause an error when trying to perform initial registration.
2019-12-02 14:58:56 +00:00
e28478c983 CORDA-3386: Improve node configuration override documentation (#5777)
* Update docs for environment variables

* Typo corrections

* More tweaks

* Address review comments
2019-12-02 14:42:23 +00:00
6e467f20b3 CORDA-3470 Fix flow async operations (#5780) 2019-12-02 14:40:07 +00:00
1caeeb01de CORDA-3476: Fix typo in node database table documentation (#5779) 2019-12-02 11:58:55 +00:00
06f97cfed5 ENT-4610 Move tx signing to the Uniqueness provider (#5773)
* ENT-4610 Move tx signing to the Uniqueness provider

* Make detekt happy

* Remove unused imports

* Address review comment
2019-11-29 17:30:33 +00:00
81a60377fa Merge pull request #5774 from corda/EdP/typo-merge-4.4
OS 4.3 -> OS 4.4 Merge
2019-11-29 14:44:06 +00:00
63b7f2093e Merge branch 'release/os/4.3' into EdP/typo-merge-4.4
# Conflicts:
#	buildSrc/build.gradle
2019-11-29 13:53:06 +00:00
04eec1de46 DOCS: Typo fix in getting started (#5772)
DOCS: Typo fix in getting started (#5772)
2019-11-29 13:18:00 +00:00
6487844ed5 Fixing small typo
"Double-click the new contract file to open it" should read "Double-click the new flow file to open it" as we're now working on flows.
2019-11-29 10:55:32 +00:00
5ce1535ea5 CORDA-3469: Allow EvolutionSerializer to handle boxed types becoming primitive. (#5766) 2019-11-28 16:39:45 +00:00
d33dbb2ea9 TM-104 Switching the distributed testing plugin to the one released in artifactory (#5764)
* TM-104 switch to using the published plugin

* TM-104 switching to artifactory plugin

* TM-104 remove unused plugin

* TM-104 adding docker plugin

* TM-104 adding docker plugin take 2

* add dependencies-dev and set distributed build plugin to changing
2019-11-28 14:49:39 +00:00
f7328f18f4 [Issue #5746] Update cities.txt (#5747) 2019-11-27 17:55:32 +00:00
200f39de97 fix: warning when @NoConstraintPropagation used needs to use the correct class loader (#5690) 2019-11-27 15:35:09 +00:00
d604820de9 put podlogs into folder with taskName to support parallel jenkins unit and integration test run (#5759) 2019-11-26 13:05:02 +00:00
45d6d3ead4 CORDA-3356 Subflow ledger consistency tests + move statemachine tests to slow integration tests (#5722)
* CORDA-3356 Subflow ledger consistency tests + move statemachine tests to slow integration tests

Add tests for subflows that fail during transitions.

Split out `StatemachineErrorHandlingTest` into a series of smaller tests.

Move these tests into the `integration-test-slow` category so they are
not run against every PR.

* CORDA-3356 Fix detekt issue

* CORDA-3356 Tidy test names
2019-11-25 17:11:54 +00:00
10e9340871 [ENT-4483] - Make shell welcome message generic (#5758) 2019-11-25 17:09:47 +00:00
21a075b727 CORDA-3197 Fix flow has been waiting message (#5660)
* Added a timestamp property to Checkpoint getting a new Instant.now() value at every Checkpoint instantiation/ copy instantiation. FlowMonitor is now using this new property (Checkpoint#timestamp) and StateMachineState#isFlowResumed to determine which flows are actually suspended. It leaves out flows that are doing work in their FlowLogic#call method.

* Cleaner comment

* Broke FlowMonitor#logFlowsWaitingForParty into logFlowsWaitingForParty and waitingFlowsToDurations. This way waitingFlowsToDurations is modular and can be tested.

Made FlowMonitor constructor get StateMachineManager instead of the retrieveFlows lamda. This way FlowMonitor is more consistent as a service, and entire flow filtering process is now being done in FlowMonitor#waitingFlowsToDurations.

Removed "smm as? StateMachineManagerInternal" in AbstractNode#start as it made no sense.

Updated CheckpointDumper to mention the Checkpoint#timestamp when writing the checkpoint as json.

* Added tests for FlowMonitor service.

* Remove old comment

* 1. FLowMonitor#waitingFlowDurations now returns a Sequence to have an iteration less.
It used to be, one iteration from returning a Set from FLowMonitor#waitingFlowDurations plus one iteration from FlowMonitor#logFlowsWaitingForParty.

2. Code reformattings

* 1. Remove constructor keyword from FlowMonitor

2. Code reformattings

3. Update detekt baseline

* Resolve conflict in Detekt baseline
2019-11-25 16:49:35 +00:00
0f92c96d15 Merge pull request #5745 from corda/EdP/CORDA-3446-4.4
Merge OS 4.3 -> OS 4.4
2019-11-25 12:47:21 +00:00
40b1a188f1 Merge remote-tracking branch 'origin/release/os/4.3' into EdP/CORDA-3446-4.4
# Conflicts:
#	docs/source/changelog.rst
2019-11-25 09:41:50 +00:00
75b68a57e4 Merge remote-tracking branch 'origin/release/os/4.4' into EdP/CORDA-3446-4.4 2019-11-25 09:40:55 +00:00
16eb2fce78 Allow taints on kubernetes nodes to determine scheduling of tests (#5755)
* allow a test group to specify taints for the nodes

* specify "effect" of toleration
modify test groups to use taints
modify preallocation to use taints

* add extra command line flags for unit test run
2019-11-25 09:39:37 +00:00
76e0054482 NOTICK - Fix typo "transcation" => "transaction" (#5749) 2019-11-22 17:52:17 +00:00
ab3c4ac7f8 CORDA-2491: Ability to specify Java package namespace from Cordform (#5075) (#5115)
Add entry point with generic extra configuration options. Move configuration verification code to avoid circular dependencies.
2019-11-21 13:10:04 +00:00
6dbde1172d [CORDA-3442] Update app upgrade notes for gradle version for PV5 (#5740)
* [CORDA-3442] Update app upgrade notes for gradle version for PV5

* [CORDA-3442] Adjust a link and add some backticks
2019-11-21 11:52:11 +00:00
001c2cbdc4 [CORDA-3373][CORDA-3374] Update Cordform docs to discuss setting Jolokia version, update version number (#5748)
* [CORDA-3374] Update Cordform docs to discuss setting Jolokia version

* [CORDA-3373] Update Jolokia version in command for node-administration
2019-11-20 16:39:28 +00:00
b5beb6119c CORDA-3158: Update docs with info about CAPSULE_CACHE_DIR (#5735)
* CORDA-3158: Update docs with info about CAPSULE_CACHE_DIR for capsule cache home

* CORDA-3158: Update docs with info about CAPSULE_CACHE_DIR for capsule cache home
2019-11-20 14:39:29 +00:00
e692ec292a Merge branch 'release/os/4.3' of https://github.com/corda/corda into EdP/CORDA-3446-4.4 2019-11-20 10:36:38 +00:00
ae8b5c1a96 CORDA-3446 finalizing transactions with only one participant (#5742)
CORDA-3446 finalizing transactions with only one participant (#5742)
2019-11-20 10:03:25 +00:00
926429647d CORDA-3307: Fix for underscore variables (#5682)
* Revert "Revert "CORDA-3307 - add support for environment variables in linux (#5523)" (#5643)"

This reverts commit 03ab258fc2.

* Env variables with underscore are now validated using schema validation and checking for unknown key errors.

* Resolving comments from PR review.

* Fix for deprecated import.

* Reworked logic according to PR review.

* Resolved bad string parsing problems where the json structure could be broken if some symbols were included in the key or value.
2019-11-19 17:51:52 +00:00
698909a1ac disable preallocation on regression builds (#5743) 2019-11-19 17:38:38 +00:00
c349ff719d NOTICK - Add ENUM to the C++ serialiser (#5616) 2019-11-19 16:00:11 +00:00
ce8ce2ba7c CORDA-2876: Upgrade to deterministic-rt 1.0-RC01. (#5738) 2019-11-19 15:02:35 +00:00
a791e38319 CORDA-3443: Do not log warning when appending duplicated network parameters (#5739) 2019-11-19 15:02:07 +00:00
138a2f114d Refresh token by invoking KubeCTL before each Kuberenetes API invocation (#5732)
* fix merge issue with sidecar image work

* add logic to refresh token in GKE

* set streaming to true

* set streaming to true

* set streaming to false, and increment number of workers for regression test as approaching 1h limit

* set PR build to run unit and integration tests

* try method distribution to see if faster

* rename test stage to reflect the fact it runs unit tests

* remove commented out parallel unit test code
2019-11-19 15:01:42 +00:00
890aaad898 [ENT-4430] - Remove infinite retrying from first attempt to establish a connection (#5737) 2019-11-19 15:01:01 +00:00
304b809d6b Updates for finalizing transactions with one participant 2019-11-19 14:32:33 +00:00
7abc1533ea CORDA-2963: Migrate deterministic-rt.jar into DJVM repository. (#5733) 2019-11-19 11:46:34 +00:00
5f819c1917 Merge pull request #5723 from corda/my_merge_branch
Merge OS4.3 -> OS4.4
2019-11-18 19:26:07 +00:00
221576d94a move - responding flow from suffix to prefix of test name (#5731) 2019-11-18 15:41:15 +00:00