Commit Graph

7946 Commits

Author SHA1 Message Date
stefano
0488a5ac5d Merge remote-tracking branch 'origin/release/os/4.3' into merge_4.3_to_4.4
# Conflicts:
#	constants.properties
2019-10-08 15:57:14 +01:00
Stefano Franz
298c91ce82
Webook test branch (#5528)
* add ability to index by class OR method

* disable unit tests again

* pending commit

* stream output of build for debugging

* remove git from the base image

* re-enable NodeRPCTests

* add ability to distribute tests based on TeamCity CSV output for test times

* try enabling unit tests again after test distribution has been fixed

* refactor BucketingAllocator to be a class, which bucketingAllocatorTask delegates to.

* finishing touches for improved test distribution

* create new pipelines for builds
2019-10-08 16:33:24 +02:00
Stefan Iliev
ca0c7e02ae CORDA-2756 - Node configuration doc change (#5550)
* Added note to the node configuration docs regarding duplicate keys.

* Added explanation about override priority.

* Grammar change according to PR review.
2019-10-08 12:57:51 +01:00
josecoll
efa01410ec CORDA-3263 Improve error handling for registering peer node (#5559)
* Capture and log "nodeInfo" persistence failures, whilst maintaining an optimistic retry mechanism.

* Additional test cases (update and insert)

* Handle both updates and inserts consistently (single transaction for happy path)

* Fix detekt violations and update baseline with false detection.

* Streamline the code a little.

* Update baseline reporting false violation.
2019-10-08 11:38:11 +01:00
josecoll
246ec8766e
CORDA-3224 JDK11 built and published artifacts to include classifier. (#5488)
* JDK11 built and published artifacts to include classifier.

* Added additional non-intuitive gradle dust sprinkled recommended by CR.

* Added additional non-intuitive gradle dust sprinkled recommended by CR.

* Bump corda gradle plugins version.

* Incorporating PR review feedback.

* jdk11Classifier
2019-10-08 10:45:10 +01:00
Stefan Iliev
31014e1022 CORDA-3246 - Missing logs on shutdown (#5501)
* Disabled shutdown hook on log4j2 as se are calling LogManager.shutdown manually and having multiple shutdowns breaks the logic and misses flushing out events.

* Added docs entry about shutdownHook needing to be disabled in case of a config override.

* Changes according to PR.

* More changes according to PR.

* Changed note according to PR review.
2019-10-08 10:18:19 +01:00
Dimos Raptis
ec4d20d987 [CORDA-3243] - Improve CorDapp loading logic for duplicates (#5551) 2019-10-07 16:20:55 +01:00
Stefano Franz
5ce0a540c8
fix config generation for testnet (#5548) 2019-10-07 13:04:11 +02:00
josecoll
42e104ca4f
Publish checkpoint agent jar and allow for inclusion of version id in jar upon run-time execution. (#5553) 2019-10-04 14:28:42 +01:00
Nick Dunstone
dfa6291b2f CORDA-3235: O/S version of fix for slow running in 4.3 (#5531)
* O/S version of fix for slow running in 4.3

* Removal of IdentityServiceInternal from test classes

* Code review comments

* O/S version of fix for slow running in 4.3

* Removal of IdentityServiceInternal from test classes

* Code review comments

* Re-baselined Detekt

* Fixed warning
2019-10-04 11:15:31 +01:00
Dimos Raptis
4f0c87a697 [CORDA-3274] - Enhance backwards compatibility logic to include Inter… (#5549)
* [CORDA-3274] - Enhance backwards compatibility logic to include InternalCordaRPCOps

* Add InternalCordaRPCOps in server-side backwards compatibility logic
2019-10-03 18:17:48 +01:00
josecoll
1a4aaf32f0
CORDA-2050 Prevent node startup failure upon cross-platform execution. (#5527)
* Prevent fat packaging of platform-specific JDK tools.jar (required at compile time for Java 8).

* Catch Throwable.

* Re-instate "tools.jar" in corda.jar as JRE's do not ship with this platform dependency.

* Baseline "TooGenericExceptionCaught".
2019-10-03 15:46:54 +01:00
opticyclic
e0eb358d59 Create an emptyMap when MDC.getCopyOfContextMap() is null (#5545) 2019-10-03 11:48:47 +01:00
Mike Hearn
2965a21d2f
Fix logo image in README.md
Closes #5340
2019-10-02 13:05:45 +02:00
Jonathan Locke
a8b8bda500
Merge from OS 4.3 up to 6ae91510
Merge from OS 4.3 up to 6ae91510
2019-10-02 09:27:40 +01:00
Chris Rankin
35ac41f802 Merge commit '6ae9151012797172b2b2b12de908872ae276674c' into chrisr3-os-4.3-4.4 2019-10-01 17:06:44 +01:00
Stefano Franz
0a4240d58d
Merge pull request #5540 from corda/merge/2019-10-30-os-43-to-44
Merge/2019 10 30 os 43 to 44
2019-10-01 16:42:35 +01:00
Stefano Franz
514171823e
Merge pull request #5539 from corda/revert-5534-merge/2019-10-30-os-43-to-44
Revert "OS 4.3 to OS 4.4 merge on 2019/09/30"
2019-10-01 16:38:14 +01:00
Stefano Franz
fa2720783a Revert "OS 4.3 to OS 4.4 merge on 2019/09/30 (#5534)"
This reverts commit 191fb83dec.
2019-10-01 16:37:49 +01:00
josecoll
1ac1c483ff
ENT-4240 Added general exception handler for Virtual Machine errors. (#5530)
* Added general exception handler for capturing and exiting on all types of Virtual Machine errors.

* Minimize additional processing (use constant string for error message).

* Remove redundant DB specific thread termination handler.

* Incorporating PR review feedback.

* Add println before halt.

* Add println before halt ... to stderr
2019-10-01 16:12:55 +01:00
szymonsztuka
191fb83dec OS 4.3 to OS 4.4 merge on 2019/09/30 (#5534)
* CORDA-3273: Replace deprecated use of Class.newInstance() for sake of DJVM. (#5522)

* ENT-4090: move startFlow into try block so exception is caught and managed (#5519)

* CORDA-3091: Move executor thread management into CordaRPCConnection (#5491)

* CORDA-3184 - Vault Query API enhancement: strict participants matching (#5524)

* Implementation of exact participant parsing for common query criteria.

* Added more unit tests + fixed a minor bug.

* Additional clean-up.

* Add documentation and changelog entry.

* Revert debug level SQL logging.

* Fix detekt errors.

* Fix docs formatting in code samples.

* Updating baseline (false positives being reported).

* Fix "Name shadowed: subRoot" code quality check.

* Fix API stability checker failures.

* Update baseline.

* TM-43 updating code style docs to reflect the addition of Detekt (#5521)

* CORDA-3226 Fix dba migration for PostgreSQL following changes in CORDA-3009 and ENT-4192 (#5529)

* Fix dta migration for PostgreSQL following changes for CORDA-3009 Invalid hash function used for PersistentIdentity in PersistentIdentityService
and ENT-4192 Identity service refactor for confidential-identities and accounts.

* Different table definition for PostgreSQL and other dbs in one changeset instead of running generic DDL and the specifically fix table in Postgres (in relation to CORDA-3009 Invalid hash function used for PersistentIdentity in PersistentIdentityService and ENT-4192 Identity service refactor for confidential-identities and accounts).
2019-10-01 13:22:42 +01:00
Jonathan Locke
6ae9151012
CORDA-2050: Remove Gradle's evaluation dependency on node:capsule.
CORDA-2050: Remove Gradle's evaluation dependency on node:capsule.
2019-10-01 10:44:04 +01:00
Razvan Codreanu
fd0323298a TM-44 New detekt rules based on feedback (#5526)
* TM-44 draft of the new rules

* TM-44 resolving merge conflict

* TM-44 removing unused rules from the config

* TM-44 fixed merge conflict
2019-10-01 10:29:28 +01:00
Chris Rankin
026a625946 CORDA-2050: Remove Gradle's evaluation dependency on node:capsule. 2019-10-01 09:06:52 +01:00
szymonsztuka
ac2c822dd4 Merge branch 'release/os/4.3' into merge/2019-10-30-os-43-to-44 2019-09-30 16:20:58 +01:00
szymonsztuka
3874e0c178 CORDA-3226 Fix dba migration for PostgreSQL following changes in CORDA-3009 and ENT-4192 (#5529)
* Fix dta migration for PostgreSQL following changes for CORDA-3009 Invalid hash function used for PersistentIdentity in PersistentIdentityService
and ENT-4192 Identity service refactor for confidential-identities and accounts.

* Different table definition for PostgreSQL and other dbs in one changeset instead of running generic DDL and the specifically fix table in Postgres (in relation to CORDA-3009 Invalid hash function used for PersistentIdentity in PersistentIdentityService and ENT-4192 Identity service refactor for confidential-identities and accounts).
2019-09-30 14:20:12 +01:00
Razvan Codreanu
ccdd5a20dd TM-43 updating code style docs to reflect the addition of Detekt (#5521) 2019-09-30 11:55:24 +01:00
josecoll
7dd6ecf96e
CORDA-3184 - Vault Query API enhancement: strict participants matching (#5524)
* Implementation of exact participant parsing for common query criteria.

* Added more unit tests + fixed a minor bug.

* Additional clean-up.

* Add documentation and changelog entry.

* Revert debug level SQL logging.

* Fix detekt errors.

* Fix docs formatting in code samples.

* Updating baseline (false positives being reported).

* Fix "Name shadowed: subRoot" code quality check.

* Fix API stability checker failures.

* Update baseline.
2019-09-27 15:44:04 +01:00
Andrius Dagys
ef57e9909c
CORDA-3124: Ensure transaction is fully verified before sending to notary (#5516)
NotaryFlow.Client flow assumes the passed transaction is verified, which is
the case when it's invoked as a sub-flow in FinalityFlow. However,
NotaryFlow.Client can also be called directly from any custom flow, so
we need to ensure it performs transaction verification to avoid accidentally
sending an invalid transaction to a non-validating notary.
2019-09-27 13:09:36 +01:00
Jonathan Locke
2e148f96a2
Merge of 4.3 -> 4.4 (#5525)
Merge of 4.3 -> 4.4 (#5525)
2019-09-27 10:08:11 +01:00
Ryan Fowler
6ca4b589e2 CORDA-3091: Move executor thread management into CordaRPCConnection (#5491) 2019-09-26 17:48:07 +01:00
Ryan Fowler
be6824dac4 ENT-4090: move startFlow into try block so exception is caught and managed (#5519) 2019-09-26 17:37:36 +01:00
Chris Rankin
9c8048008f CORDA-3273: Replace deprecated use of Class.newInstance() for sake of DJVM. (#5522) 2019-09-26 16:40:08 +01:00
Viktor Kolomeyko
39828326a9 Merge branch 'release/os/4.3' into vkolomeyko/4.3-merge
# Conflicts:
#	constants.properties
2019-09-26 16:23:58 +01:00
Viktor Kolomeyko
51330c2e44 CORDA-3232: Support of multiple interfaces for RPC calls (#5495)
* CORDA-3232: Make backward compatible RPC client changes

Such that it will be able to talk to new and old server versions.

* CORDA-3232: Make backward compatible RPC server changes

Such that it will be able to talk to new and old client versions.

* CORDA-3232: Trick Detekt

* CORDA-3232: Integration test for multi-interface communication.

* CORDA-3232: Add legacy mode test.

* CORDA-3232: Making Detekt happier

* CORDA-3232: Fix Detekt baseline after merge with `4.3` branch

* CORDA-3232: Incrementing Platform version

As discussed with @lockathan

* CORDA-3232: Fix legacy test post platform version increment

* CORDA-3232: Use recursive logic to establish complete population of method names

* Revert "CORDA-3232: Incrementing Platform version"

This reverts commit d75f48aa

* CORDA-3232: Remove logic that conditions on PLATFORM_VERSION

* CORDA-3232: Making Detekt happier

* CORDA-3232: Few more changes after conversation with @mnesbit

* CORDA-3232: Make a strict match to `CordaRPCOps` on client side

Or else will fail:
net.corda.tools.shell.InteractiveShellIntegrationTest.dumpCheckpoints creates zip with json file for suspended flow

Flagging that `InternalCordaRPCOps.dumpCheckpoints` cannot be called.

* CORDA-3232: Address PR comments by @rick-r3

* CORDA-3232: Address further review input from @rick-r3

* Change the way how methods stored in the map;
* Extend test to make sure that `CordaRPCOps` can indeed be mixed with other RPC interfaces.
2019-09-26 16:01:14 +01:00
Tudor Malene
298d8ba69c CORDA-3024 Rename the webserver (#5489) 2019-09-26 10:20:49 +01:00
Jonathan Locke
f945e57c17
OS 4.1 -> OS 4.3 merge
OS 4.1 -> OS 4.3 merge
2019-09-26 09:41:58 +01:00
Jonathan Locke
f9ed73bfc8
Merge OS 4.3 into OS 4.4 up to 219624fba7.
Merge OS 4.3 into OS 4.4 up to 219624fba7.
2019-09-25 16:33:54 +01:00
Ed Prosser
defa2565ea Merge branch 'release/os/4.1' of https://github.com/corda/corda into ENT-4104-4.3-EdP 2019-09-25 10:47:06 +01:00
bpaunescu
4672c3a13c
CORDA-3240: optional node.conf property not recognized when overridden (#5505)
* CORDA-3240: optional node.conf property not recognized when overridden

* CORDA-3240: address detekt issues

* [NOTICK]: undo incorrectly commmented out include
2019-09-25 10:34:26 +01:00
edward-prosser
b94506ca9f
Merge pull request #5506 from corda/ENT-4104-EdP
ENT-4104: Removing metrics we don't use.
2019-09-25 09:50:03 +01:00
edward-prosser
5f95b54862
Merge pull request #5406 from akegaviar/release/os/4.3
Fix typo in docs/quickstart
2019-09-25 09:31:29 +01:00
Chris Rankin
c0eb8c03c0 Merge commit '219624fba7e77765ede9ed6b84193736a448a553' into chrisr3-os-4-3-4.4-merge 2019-09-24 23:06:00 +01:00
josecoll
219624fba7
CORDA-3266 Add missing quasar classifier to web server capsule manifest (#5515)
* Set JFX 3rd party library dependency (fontawesomefx) according to Java version.

* Revert quasar lib back to version 0.7.10 (java 8).

* Added missing classifier to webserver javaAgent capsule manifest declaration.
2019-09-24 18:29:32 +01:00
josecoll
f75183caa6
CORDA-2050 Revert back to quasar 0.7.10 (Java 8) (#5514)
* Set JFX 3rd party library dependency (fontawesomefx) according to Java version.

* Revert quasar lib back to version 0.7.10 (java 8).
2019-09-24 13:24:16 +01:00
Roger Willis
434a0ed274
Update change log and kdocs for Identity Service changes. (#5509) 2019-09-24 13:08:14 +01:00
josecoll
6666ee1a46
Set JFX 3rd party library dependency (fontawesomefx) according to Java version. (#5513) 2019-09-24 12:09:01 +01:00
Chris Rankin
6d467bdbb1 CORDA-2050: Ensure that ArraySerializer.elementType is resolved for GenericArray. (#5512) 2019-09-24 11:28:23 +01:00
Razvan Codreanu
e8a35d6a32 TM-32 backporting detekt config changes to OS 4.1 and rebaselining (#5507) 2019-09-24 11:20:04 +01:00
josecoll
f4f46af706
CORDA-3209 Fix vault query for participants specified in common criteria (#5508)
* Generalise participant parsing code & additional test cases.

* Use a common predicate to expand the participants query (when specified more than once - eg. in fungible and linear query criteria).

* Introduce some re-usable functions.

* Additional code clean-up and improvements.

* Fix detekt MaxLineLength errors.
2019-09-24 10:32:06 +01:00