Commit Graph

13099 Commits

Author SHA1 Message Date
4ffe2960db Merge pull request #1379 from corda/os-merge-d56a80d
O/S merge d56a80d
2018-09-10 13:23:22 +01:00
cc58a0c34a ENT-2414 Cache trace capture (#1372)
* Refactor cache tracing so it is available in core (without pulling in any extra dependencies

* Wrap all named caches in trace wrapper (if configured to create traces)

* Remove special case for NodeVaultService and initialise CacheTracing config as soon as possible.

* Keep checkCacheName internal

* Revert back to use Google Longs class rather than hand-rolled code.

* Add comment explaining unusual location of initialisation code.

* Code review rework
2018-09-10 11:56:39 +01:00
31530b35c6 Merge fixes 2018-09-10 11:45:53 +01:00
8e4547c811 Merge remote-tracking branch 'open/master' into os-merge-d56a80d
# Conflicts:
#	core/src/main/kotlin/net/corda/core/internal/cordapp/CordappImpl.kt
#	finance/build.gradle
#	node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
#	node/src/main/kotlin/net/corda/node/VersionInfo.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt
2018-09-10 11:03:58 +01:00
d56a80d159 CORDA-1958: The node ready future completes on the first poll of the network map sources, even if they return empty. (#3904)
This is to allow the first node in a test environment to fully start up.
2018-09-10 10:43:40 +01:00
83e66d542d Syncing Cordapp info code from ENT so that ENT-1731 is fully ported (#3914)
Also, Cordapp.Info has been made internal as it's not used in the public API
2018-09-10 10:43:00 +01:00
dea7d0b905 Merge pull request #1378 from corda/os-merge-4f8a564
O/S merge 4f8a564
2018-09-07 16:31:51 +01:00
4183d55650 ENT-1906: Publish corda-deterministic-verifier artifact for testing cordapps. (#3910) 2018-09-07 15:07:06 +01:00
46cbfefc77 Merge remote-tracking branch 'open/master' into os-merge-4f8a564
# Conflicts:
#	experimental/behave/src/main/kotlin/net/corda/behave/process/Command.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2018-09-07 14:49:52 +01:00
4f8a564104 CORDA-1964: Resolve some Gradle warnings which will soon become errors. (#3911) 2018-09-07 14:26:35 +01:00
458bedd936 Merge pull request #1374 from corda/anthony-os-merge-20180906
O/S Merge 20180906
2018-09-07 12:14:23 +01:00
1ca5d03cd2 Fix multiple address failure on node startup 2018-09-07 10:32:31 +01:00
db6c7f38a5 Support for case insensitive vault queries (#3853)
* Make the criteria builder functions case insensitive

Add IGNORE_CASE versions of the comparison operator enums
Add exactMatch argument to criteria builder functions where strings can be passed in and set its default value to true
Use JvmOverrides to provide the default true version to java without needing to specify a value manually
If exactMatch is true then the original enums will be used, if false the IGNORE_CASE enums will be used instead
HibernateQueryCriteriaParser.columnPredicateToPredicate now takes into account the IGNORE_CASE versions of the enums

* Tidy up QueryCriteriaUtils and HibernateQueryCriteriaParser

Split HibernateQueryCriteriaParser.columnPredicateToPredicate into smaller functions
Reduce duplicated code in QueryCriteriaUtils

* Tidy up QueryCriteriaUtils and HibernateQueryCriteriaParser

Split HibernateQueryCriteriaParser.columnPredicateToPredicate into smaller functions
Reduce duplicated code in QueryCriteriaUtils (missed some code here)

* update changelog and api-vault-query docs with new API functions

* reorder Operator enums so that the ignore case enums are at the end

In case anyone is depending on the order of the enums, to keep compatibility with existing CorDapps the enums should be added at the end to prevent ordinals from breaking.
2018-09-07 10:20:21 +01:00
c6400cf344 Some clean up of behave code (#3907)
In particular, fixing the recursive call of the "use" method
2018-09-06 16:44:18 +01:00
d58489939b Fix merge conflict 2018-09-06 16:41:40 +01:00
230d91046c Merge commit '20cd4539d637676ac55457fc7fe4df2ce8dacff8' into anthony-os-merge-20180906
# Conflicts:
#	node/capsule/build.gradle
2018-09-06 16:03:39 +01:00
8ad540d1c7 Move identity alias prefixes from DevIdentityGenerator to X509Utilities (#3902) 2018-09-06 15:48:59 +01:00
20cd4539d6 Fixed broken master. (#3906) 2018-09-06 15:07:03 +01:00
4a70d1a996 Fixing enterprise only uses of NetworkMapCacheImpl 2018-09-06 14:50:44 +01:00
793ee3e1ee Store default platform version in a constant (#3900)
* use constant for default platform version value when tests with out of process nodes are run from Intellij.

* node will use constant for platform version instead of manifest file(RPC already uses the constant, no sense in having 2 sources for it)

* fix issues caused by merge
2018-09-06 14:32:23 +01:00
584387d5ec Fixed some problem I discovered while working on another story (#3901)
* - Fixed some problems with error handling for Observables.
- Eliminated incorrect double `stop()` call for RpcBroker.
- Added `Schedulers.shutdown()` call in `stop()` implementation for Node and Driver, to avoid stuck processes when observable pipelines go wrong.

* Fixed a missing import.

* Removed `Schedulers.shutdown()` for now.

* Fixed an issue with `pendingFlowsCount()` function.
2018-09-06 13:11:41 +01:00
ca9649ec0f CORDA-1964: Upgrade to Gradle 4.10 (#3903) 2018-09-06 12:48:31 +01:00
ae8752df57 Remove CLI UX guidelines from enterprise repo 2018-09-06 11:49:36 +01:00
eb7cdda8a8 ENT-2247: node will deal with loss of broker according to configuration (#1373) 2018-09-06 11:37:13 +01:00
8d03da2f8d Fix compilation error 2018-09-06 11:34:12 +01:00
b8a4b68495 Merge remote-tracking branch 'open/master' into anthony-os-merge-20180906
# Conflicts:
#	docs/source/contributing-index.rst
#	docs/source/contributing.rst
#	docs/source/running-a-node.rst
#	node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
#	node/src/main/kotlin/net/corda/node/Corda.kt
#	node/src/main/kotlin/net/corda/node/NodeArgsParser.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
2018-09-06 11:20:45 +01:00
767580c298 Flow worker POC zookeeper flow partitioning (#1369)
* Flow worker zookeeper WIP

* remove copyright decaration

* remove shaded curator and depends on node-api shadow instead
2018-09-06 10:09:31 +01:00
536ecdfe67 CORDA-1760 CLI UX guidelines (#3686)
* Create CLI UX Guidelines

* More tweaking

* Address review comments

* More tweaks

* Add recommendation for generating and installing completion files

* Update documentation to include base class information

* Use ExitCodes base class
2018-09-06 09:37:30 +01:00
3284a61afd CORDA-1755: Modify the node to run using picocli (#3872)
* Modify Corda Node to use picocli

* Make --sshd parameter actually work

* * Some refactoring
* Fixing the issue with the --confg-file parameter
* Updating the tests

* Restore original devMode behaviour

* Update documentation

* Add return code to network bootstrapper

* Use the root jar for the shell alias for jars packaged with capsule

* Update Corda jar description

* Fix issue with logging not initialising early enough in node
Make initLogging overridable
Combine --verbose and --log-to-console options

* Tidy up

* Make sure all command line options are documented properly

* Fix compilation error

* Remove code that's no longer needed (single slash options no longer supported unless explicitly specified)

* Remove comment

* Remove pointless comment

* Log commandline arguments

* Address review comments

* Address more review comments

* Remove ConfigFilePathArgsParser

* Remove some unused importss

* Only display config when in dev mode

* Force Ansi ON if on Windows else set to AUTO.

* Make ExitCodes class open
2018-09-06 09:37:04 +01:00
304dba704e Support HA without load balancer (#3889)
Allow configuration in node for additional advertised addresses.

fix logic error

Use empty list as default config not null

Allow multiple addresses in NodeInfo

Describe new additionalP2PAddresses property in docs.

Add integration test of additionalP2PAddress feature

Fixup after rebase

Address PR comment

Address PR comments by removing unused element of NodeAddress
2018-09-05 17:46:46 +01:00
e3ece00bea ENT-1906: Publish DJVM artifact with its dependency information. (#3897)
Also migrate enclavelet code into testing:common jar.
2018-09-05 15:57:12 +01:00
9373c0fb8e Removed the superfluous NetworkMapCacheImpl class (#3882)
NetworkMapCacheImpl and NetworkMapCacheBaseInternal interface merged into PersistentNetworkMapCache and NetworkMapCacheInternal interface respectively.
2018-09-05 14:10:37 +01:00
541a0d7d5b ENT-1906: Remove SLF4J's JUL logging bridge from DJVM. (#3895)
* Remove SLF4J's JUL logging bridge from DJVM.
* Refactor SLF4J's Log4J back end into the CLI.
2018-09-05 14:05:52 +01:00
4ee63c77d7 Merge pull request #1371 from corda/os_ent_merges/caseSensitiveOsFix
Fixed compilation error for case-insensitive operating systems. (#3896)
2018-09-05 13:31:43 +01:00
ce0bf9eb2e Fixing compilation. 2018-09-05 13:11:53 +01:00
481f2c1b93 Fixed compilation error for case-insensitive operating systems. (#3896)
(cherry picked from commit 2fbeab1365)
2018-09-05 13:10:05 +01:00
2fbeab1365 Fixed compilation error for case-insensitive operating systems. (#3896) 2018-09-05 13:06:05 +01:00
f2784197c7 Minor: fix old warning in Corda 1.0 docs, don't recommend use of Jigsaw yet. 2018-09-05 13:22:56 +02:00
7f3bcbe7c3 Tidy up DemoBench's fallback logging configuration for JUL. (#3894) 2018-09-05 12:14:35 +01:00
be45096082 CORDA-1864: Added getter for network parameters to RPC (#3892) 2018-09-05 11:17:13 +01:00
ce65a58c7c CorDapp minimum and target version design doc. (#3798) 2018-09-05 11:12:35 +01:00
5b255c81a8 ENT-1906: Trivial tweaks to DJVM code. (#3890)
* Trivial tweaks to DJVM code.
  - Use ASM Type.getInternalName()
  - Use @JvmDefault annotation
  - Declare test base class as abstract
  - Ensure test Log4J configuration has precedence
  - Replace assert() with require()
  - Replace simple lambdas with function references
* Publish corda-djvm artifact.
* Migrate Utilities class into the CLI tool.
* Configure unit tests for console logging.
2018-09-05 10:12:48 +01:00
1032b44f18 Merge pull request #1370 from corda/fixes/certificateStoreStubs
OS -> ENT merge: fixing a bug in certificate store stubs.
2018-09-04 17:42:19 +01:00
b36240a7e7 Merge remote-tracking branch 'remotes/open/master' into fixes/certificateStoreStubs 2018-09-04 17:33:29 +01:00
0b495098a8 [CORDA-1937]: Fixes to enterprise float and bridge. 2018-09-04 17:33:05 +01:00
a7f9320985 Fixedd a mistake in CertificateStoreStubs. (#3893) 2018-09-04 17:31:42 +01:00
4931b77dd4 Update labels of nightly performance test plan (#1366) 2018-09-04 16:24:43 +01:00
b4a64625fc Merge pull request #1368 from corda/os_ent_merges/CORDA-1937
OS -> ENT merges: CORDA-1937
2018-09-04 13:39:03 +01:00
c77a75bc10 [CORDA-1937]: Fixes to enterprise float and bridge. 2018-09-04 11:28:21 +01:00
31e58dd2e5 [CORDA-1937]: Fixes to enterprise float and bridge. 2018-09-04 11:20:34 +01:00