Commit Graph

5560 Commits

Author SHA1 Message Date
058e694d31 Minor: fix a couple of Kotlin build file issues that cropped up whilst upgrading 2018-02-08 13:31:47 +00:00
865364f283 Upgrade Kotlin to 1.2.20 2018-02-08 13:31:47 +00:00
8081ee42ad CORDA-939 - Dont expose FlowStateMachine via public API (#2438)
* Create CordaInternal attribute for properties on public classes that are not part of the api and apply to FlowLogic.stateMachine

* Remove startFlow from public test api and replace with startFlowAndReturnFuture

* Update api-current with changed signature

* Change test used in documentation to use public test methods

* Remove the rest of the unneccessary usages of the startFlow test utility

* Remove extra whitespace

* Rename startFlowAndReturnFuture back to startFlow

* Update api

* The annotation doesn't appear unless its marked as on the actual getter and setter

* Updated docs and removed pointless attribute

* Deleted whitespace
2018-02-07 11:55:06 +00:00
95f062e8ff CORDA-904 - Fix evolver to work with setter instantiated classses (#2463)
* CORDA-904 - Make evolver work with classes that use setters

* review comments

* review comments

* small fixs

* don't include systemTest in compiler.xml
2018-02-06 12:55:49 +00:00
3b5d89883d Added basic node configuration validation. (#2433) 2018-02-05 18:17:54 +00:00
69c989478a CORDA-979 - Make public Java setter accessible within Kotlin (#2464)
* CORDA-979 - Make public Java setter accessible within Kotlin

* Review comments
2018-02-05 16:54:58 +00:00
45ff60fccc Init CRaSH shell only when it's really needed (#2448)
* Avoid initializing CraSH if its not to be used
2018-02-05 14:01:38 +00:00
429da85650 CORDA-946 - Fixes to fingerprinting breaks backward compatibility (#2453)
* CORDA-946 - Fixes to fingerprinting breaks backward compatibility

Demonstrated using the network map parameters signed form as that's
where the problem was first seen

* Review Comments
2018-02-05 12:07:02 +00:00
a9856b9ce6 Docker system (end-to-end) test (#2437)
* System test for IRS Demo utilizing docker, docker-compose and PhantomJS to automate full-stack testing
2018-02-05 11:42:20 +00:00
a08d333d5b CORDA-978 - Only consider getters that accpet zero parameters (#2462)
* CORDA-978 - Only take getters with zero parameters

* tidy up
2018-02-05 09:48:41 +00:00
8e2524f35d CORDA-977 PK constraint violation when up adding Mapping to DBTransactionMapping store (#2457)
* Default jolokia version with optional override in CorDapp project gradle file.

* Tolerate duplicates to prevent a PK violation.
2018-02-02 17:33:35 +00:00
2a3c4eb3cd Documents test frameworks in quickstart guide for visibility. Small tweaks. 2018-02-02 17:26:54 +00:00
57ba9cdf06 CORDA-915 - Replace BEANS introspector with standard reflection (#2400)
* CORDA-915 - Replace BEANS introspector with standard reflection

Removes lib dependency and puts something in place we can better
control

* CORDA-915 - Review comment corrections

* Review Comments
2018-02-02 16:58:43 +00:00
38ccd0572c Use Java reflection for determining if a type is a Kotlin singleton. (#2446)
Kotlin's own reflection has a habit of throwing weird errors and does not work for private objects - thus the unit test which tests this feature has actually never worked properly, but somehow works by accident. An attempt to upgrade to the latest Kotlin revealed the issue so it must have always been unstable.
2018-02-02 17:17:23 +01:00
82ece34ac8 Tweak the way invocation context is integrated to reduce the pain for devs using the old API (#2447)
Minor tweaks to the invocation context code.

1) Un-deprecate FlowInitiator, move the deprecation to the field. This
   eliminates large numbers of warnings and means developers are warned
   only once in the place where they obtain one.

2) Add documentation for StateMachineInfo and create a type alias to give
   it a better name in an ABI compatible way.

3) Improve markup on InvocationContext

4) Rename field from just "context" to "invocationContext" (Context is vague)
2018-02-02 17:09:08 +01:00
f3d2a7674c Add module for end-to-end testing library 2018-02-02 12:20:14 +00:00
18fa226da7 Merge pull request #2440 from corda/kat/bug/CORDA-943
CORDA-943 - Fix trader demo
2018-02-02 09:56:44 +00:00
4ac2c59623 Adds links to referenced code files. 2018-02-01 18:34:44 +00:00
eb99a7d775 Refresh API/ABI definition file (#2449) 2018-02-01 17:26:54 +01:00
258b562e16 set network registration poll interval via http cache control header (#434) (#2445)
* set network registration poll interval via http cache control header from the server side

* default poll interval to 10 seconds if cache header not found

* address PR issues

* address PR issues

(cherry picked from commit dca8699)
2018-02-01 15:18:53 +00:00
00b90a98fb CORDA-943 - Cope with multiple generics at str->type conversion in AMQP
Also fixes an odd bug where the inferred type of a getter wasn't
matching the constructor parameter type because that was still unbounded
and seen as T, looking at the raw type allows us to inspect this
properly
2018-02-01 12:19:32 +00:00
0c93f1d4b1 Remove exposure of internal hibernate configuration from mockservices (#2442) 2018-02-01 10:31:11 +00:00
781d517761 Added documentation and extra logging to publish tasks (#2427)
Added documentation and extra logging to publish tasks
2018-01-31 20:56:25 +00:00
409cdf05e0 Added option to enable docs only builds if a specific file is present (#2441)
Added option to enable docs only builds if a specific file is present
2018-01-31 20:46:31 +00:00
941429d3a7 Remove word restriction in corda x500 name (#2439)
* Remove word restriction in x500 name https://github.com/corda/corda/issues/2326

* remove unused const

* address PR issue

* address PR issue

* address PR issue
pre-release-V3-branchpoint
2018-01-31 17:05:52 +00:00
222c5b9db8 CORDA-943 - Fix trader demo
This is a multi issue problem
1. Fingerprinting of generics treats <T> and <?> differently, forcing
the evolver to be used when not needed

2. However, the evolver is required sometimes as generics are not
guaranteed to fingerprinting bi-directionally (thanks to type erasure of
deeply nested generic types). However, with serialization now writing
properties in a specific order, we need to ensure they're read back in
that order before applying them to an evolved constructor so as to
not corrupt the object reference cache
2018-01-31 14:58:00 +00:00
ceff50d656 Refactor location of bridge code to allow out of process bridging (#2431)
Fix some issues Andras has seen
2018-01-30 16:29:59 +00:00
2d557d04b4 Minor rewrites. Better documentation of granting RPC permissions to RPC users. 2018-01-30 16:06:20 +00:00
d6f9721cb8 Docs: move serialisation into the CorDapp section. Fix some markup issues (#2429)
* Docs: move serialisation into the CorDapp section. Fix some markup issues.

* Address review comments
2018-01-30 10:59:03 +01:00
685ab4c9b0 Add trace logging to network map client (#2424)
* Add trace logging to network map client

* Add trace logging to network map client

* address PR issue

* address PR issue
2018-01-29 17:44:28 +00:00
28e29c0873 Fix path issue which causes windows build failure. (#2430) 2018-01-29 17:43:48 +00:00
9ca63d173d Update OWASP dependency checker to latest working version 2018-01-29 18:36:51 +01:00
93054a9590 Add cmdline option for network root truststore and password (#2407)
* add cmdline option for network root truststore and password, instead of using node's truststore configuration to avoid confusion.

* revert line auto format

* fix failing integration test

* address PR issue
2018-01-29 13:43:16 +00:00
4851d9ca6a Documents rationale for using cordapp, cordaRuntime and cordaCompile Gradle configs. 2018-01-29 12:42:31 +00:00
37e207eaf3 Merge pull request #2271 from corda/aslemmer-fix-irsdemo
Fix non-visible IRS demo bug
2018-01-29 11:03:08 +00:00
e19f51d9ac CORDA-959 Filter unschedules and remove database activity from inside mutex. (#2426)
* Filter unschedules and remove database activity from inside mutex.

* Race condition fix

* Bug fix
2018-01-26 17:44:42 +00:00
4257891c98 Revert "Raft Notary: remove snapshotting" (#2423)
This reverts commit cf33be66ff.
2018-01-26 16:23:59 +00:00
fca3d565ac Add 'Regulator' node for AutoOfferFlow, fixing IRS 2018-01-26 14:29:35 +00:00
58f76ee2da Put IRS spring whatever back on classpath 2018-01-26 11:21:38 +00:00
e357a88181 Deprecate TimeWindowChecker, make TimeWindowInvalid report exact current time and transaction time window (#2280)
* Make notary service return the current time and the transaction time window
along with the TimeWindowInvalid error.

Deprecate TimeWindowChecker.
Add a static method for validating transaction time window to reduce code duplication.
2018-01-26 09:32:11 +00:00
69bfc9b437 Comment out lines breaking IRS demo 2018-01-25 19:59:24 +00:00
0ff9c9e2e3 Move to message based bridge control protocol (#2410)
Tidy up

Remove dead RPCSecurity logic from ArtemisMessageServer

Address PR comments

Address PR comments
2018-01-25 17:53:34 +00:00
b8f25fe689 Docs on contributing to Corda 2018-01-25 17:15:36 +00:00
17a6f61eba Simplify CashTests and add some comments/convenience APIs to MockServices (#2241) 2018-01-25 16:29:26 +01:00
242d9cf7ad CORDA-692 Don't include internal packages in API documentation (#2415)
* Use G1 for gradle daemon
2018-01-25 15:26:13 +00:00
471907366b Renames Controller to NetworkMapAndNotary, in line with templates and example CorDapp. 2018-01-25 15:14:32 +00:00
371cb0a081 Gradle plugins: additional of publish sources configuration field (#2420)
* Gradle plugins change: publication of source code is config driven (defaults to true).
2018-01-25 14:40:11 +00:00
9783f11ba8 Exposed RPC SSL settings through Cordformation (#2419) 2018-01-25 14:32:58 +00:00
5f8af818b1 Merge pull request #2408 from corda/jamesbr-remove-jolokia-war
Remove jolokia war reference from webserver
2018-01-24 21:19:50 +00:00
0fa6969d5d Added various X509 utilities to remove some of the existing boilerplate. (#2416) 2018-01-24 18:07:29 +00:00