* Introduce SerializeForCarpenter annotation
* Apply SerializableComputedProperty annotation to Cash.exitKeys, fix bugs
* info -> trace
* Remove annotation from FungibleAsset, as we do not know whether all implementing classes will provide the property as a calculated value
* Remove redundant import
* Explicit lambda params
* Restore explicit import for Enum valueOf
* Moving and rescoping
* More meaningful error message
* Add java test and documentation
* Fix accidentally broken unit test
* Ignore superclass annotation if property not calculated in implementing class
* Exclude calculated properties from Jackson serialisation
* Fix broken test
This is a split-out change from an enterprise feature, but since we do have: `RPCApi.RPC_TARGET_LEGAL_IDENTITY` header constant even in OS, it would make sense to extend RPC client API to populate this.
* 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
* Create constraint, extract Jar signature collection
* Extract JarSignatureCollector into its own file
* Jar signature collection throws exception if signatures are inconsistent
* Focus testing in Jar signature collection
* Extract some helper functions in test
* Patch tests with mock attachment storage
* Assert that generated constraint is satisfied by signed attachment
* Clarify constraint selection logic
* Explicit return types on extension methods
* Link to docsite Signature Contrainsts documentation
* Fix issue with shared JAR reading buffer
* Add named caches and apply to NonInvalidingUnboundCache and all usages.
* Add named caches and apply to NonInvalidingCache and all usages.
* Add named caches and apply to NonInvalidingWeightBasedCache and all usages.
* Move NamedCache to core/internal
* Remove type `NamedCache` and `NamedLoadingCache`
* Suppressed 'name not used' warning, added comment, and fixed generic parameters on the buildNamed functions.
* Use `buildNamed` in all caffeine instances in production code. Not using it for caches that are created in test code.
* Add checks for the cache name
* Formatting
* Minor code review revisions
* CORDA-1844: Exposing a problem via Unit test.
* CORDA-1844: Unit test update following input from Andras.
* CORDA-1844: Add optional parameter to reduce the time it takes to shutdown RPCServer.
* CORDA-1844: Add optional parameter to reduce the time it takes to shutdown RPCServer and sensibly default it.
Minor changes.
* Eliminate un-necessary reference to Kryo in the comment
* RPC documentation update.
* Rename RpcClientObservableSerializer into RpcClientObservableDeSerializer
They're prone to cause flaky tests due to the "allocated" ports already being taken by the system when eventually needed. Replaced usages with PortAllocation.Incremental.
Affected unit tests made into integration tests to avoid any issues in the future when unit tests are made to run in parallel.
* CORDA-1743: Remove `isDebug = true` from Node driver to speed-up integration tests execution.
* CORDA-1743: Undo removal of "isDebug = true" from the test that specifically checks for this condition.
* CORDA-1743: Address input from @shamsasari
* Make Node Explorer release its RPC connection on shutdown.
* Declare Explorer's login() function as tail-recursive.
* Replace lateinit rpcConnection with oridinary var.
* Notify the node when closing an RPC connection gracefully.
In case of initial logon - it will not be re-tried to cater for invalid endpoint and/or credentials.
However, if connection been successfully established once, re-try logic is getting activated.
This requires the class carpenter to be able to run in a "lenient" mode where it permits synthesised classes to implement interfaces with unimplemented methods.
When specifying incorrect connection details for the nodes (e.g.,
wrong port), an RPCException would be thrown which was not
handled correctly, resulting in busy waiting on the UI thread.
Ideally the login should not block the UI thread anyways, but
for now this fix is the most pragmatic solution.
As reported in [CORDA-1609](https://r3-cev.atlassian.net/browse/CORDA-1609),
`CordaRPCClientConfiguration.default` is not accessible from Java since
`default` is a reserved keyword.
As part of the refactor made in #2831, `CordaRPCClientConfiguration` went
from being a data class to an interface with a backing implementation of
type `CordaRPCClientConfigurationImpl`.
This resulted in Java users having to rewrite code that was on the form:
```java
final CordaRPCClient client = new CordaRPCClient(
nodeAddress, CordaRPCClientConfiguration.DEFAULT
);
```
to something like this:
```java
final CordaRPCClient client = new CordaRPCClient(
nodeAddress, CordaRPCClientConfiguration.Companion.default()
);
```
However, this does not work. The user would get a compilation error because
`default` is a reserved keyword in Java.
Since `CordaRPCClientConfiguration` has been made an interface, there is no
easy way of introducing a static final field on the interface from Kotlin.
Consequently, I've changed this back to using a `class` with a static field
named `DEFAULT` instead of the static method `default()`.
It should be noted that `default()` / `DEFAULT` is currently only used
internally to pass in default values in `CordaRPCClient.kt` and
`CordaRPCClientUtils.kt`. That said, it is exposed as part of our API
surface and consequently shouldn't be broken.
The latter means that in the above example, the user would actually not
have to provide the parameter at all:
```java
final CordaRPCClient client = new CordaRPCClient(nodeAddress);
```
As can be seen from the definition of `CordaRPCClient`:
```kotlin
class CordaRPCClient private constructor(...) {
@JvmOverloads
constructor(
hostAndPort: NetworkHostAndPort,
configuration: CordaRPCClientConfiguration = CordaRPCClientConfiguration.DEFAULT
) : this(hostAndPort, configuration, null)
```
The mentioned [refactor](7a077e76f0 (diff-0948c125db93a22263eb81eaf3161c17R65))
did not make it into the 3.1 release, so from an API-stability perspective,
this change can be applied without affecting our commitment to a
backwards compatible API..
* Create core-deterministic and serialization-deterministic artifacts:
commit 6f77838fe53d7c9565283c20bbf20f27954b27f6
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue May 29 23:14:23 2018 +0100
Tidy up Gradle files.
commit 0aa958d31c6342e92ad4d6ab396db6e4a39d4fed
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue May 29 18:11:17 2018 +0100
Fix EnclaveletTest with deterministic core and serialisation.
commit 732fcf37ee2219dfad373200676241d2fd90aeb3
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sun May 27 00:21:42 2018 +0100
Extend JarFilter to delete typealias declarations.
commit 25dbf30ed62c0c059df07782306b7f760f4cdf73
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu May 24 17:20:41 2018 +0100
Test deserialising a contract and verifying it using core-deterministic.
commit f7753bf2ab588e084cb8bfaa5fd04f1a18d3aaef
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu May 24 11:25:49 2018 +0100
Do not remove constructors from Kotlin annotation metadata.
commit 4ddf357b71b29775aa921aca33b4505a402a20e8
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed May 23 16:30:18 2018 +0100
Add Gradle modules for deterministic rt.jar artifacts.
commit e81f462eefad2369706fd1b8447d426a71a25a03
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed May 23 16:22:04 2018 +0100
Isolate reference to WeakHashMap - for deletion!
commit eea2458fbec06b28344547fdf9c191a9445fe1e7
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu May 17 18:01:20 2018 +0100
Extract Kotlin metadata classes from kotlin-compiler-embeddable.
This fixes a classpath issue that was crashing Gradle.
commit 87fdb938d83f3de6589730343c860fbbc406942e
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue May 15 15:40:31 2018 +0100
Remove instances of ConcurrentHashMap from AMQP serialization scheme.
commit 9e7773ec32542af4df62269aea3d08e2bd3794f9
Author: Chris Rankin <chris.rankin@r3.com>
Date: Mon May 14 23:10:09 2018 +0100
Fix the checkDeterminism targets to validate JAR.
commit 6066ba89cb0077b17a7bdda79195763e86d100f9
Author: Chris Rankin <chris.rankin@r3.com>
Date: Mon May 14 09:16:14 2018 +0100
Remove private Blob object.
commit 73180723ad437b07ba4ccfd935620c0fa97039ea
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sun May 13 23:48:48 2018 +0100
Ignore unit tests if important system property is not set.
commit abfa0a85aff72007342142a9c66fea3b48f62cc7
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sat May 12 22:18:28 2018 +0100
Make deterministic tests involving keystores optional.
commit 5866f8f08910cbfa90c006e88482acec467042a5
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri May 11 17:19:57 2018 +0100
Prevent checked exceptions escaping from JarFilter tasks.
commit e2a41913e00aff2bb9b59b43f0a721c5547a8683
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu May 10 17:18:30 2018 +0100
Create node-api-deterministic artifact.
commit 804feb4e69be4899f29c0cb1c5be95f58d2c47c9
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu May 10 16:54:46 2018 +0100
Upgrade to ProGuard 6.0.3
commit ec12b0ed213c1336202012ccf864a49bb8adf727
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed May 9 12:56:15 2018 +0100
Extend JarFilter to identify extension properties correctly.
commit f0e119e2e3d90db80efb38a316f48b34082c5f49
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sat May 5 13:47:51 2018 +0100
Construct a better test jar for tasks to unzip/rezip.
commit a13380c0ee29dbdd93419f29c01a904c4a69db15
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri May 4 09:47:32 2018 +0100
Update JarFilter to Kotlin 1.2.41.
commit b774a1e359fb08077a57e8c3b4f1b314653deec0
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu May 3 16:27:43 2018 +0100
Convert some JarFilter functions into val properties.
commit b38f9a8f53a3e68e62580e0b8af625b37463cd41
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed May 2 23:05:24 2018 +0100
Tidy up Gradle test projects.
commit 421c2e6c93c0c7317e7977fd7bf134902920760e
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed May 2 22:12:18 2018 +0100
Published core-deterministic artifact is actually built by metafix task.
commit 6d7b20a6826e4c04cd252a4ff4d30ceeb9193eb4
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed May 2 16:55:01 2018 +0100
Always recompute compressed sizes for ZipEntry.
commit 05587234c4f87aeab925b73f7b7fdc22a2d77159
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed May 2 15:14:12 2018 +0100
Test whether MetaFix task can delete file timestamps from the jar.
commit 9d6bd0d5cf9f05f088d98eaf7399db4cafc64c61
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue May 1 22:15:02 2018 +0100
WIP - erase timestamps for all jar entries.
commit 4cb4d6213916d752a654d4fa8d22db6fe6e7e9c6
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue May 1 17:39:56 2018 +0100
Annotate more core elements as @Deterministic/@NonDeterministic.
commit e847c6c1f03665bd0eff228ce242958512155860
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue May 1 17:17:24 2018 +0100
Update JarFilter so that void methods are stubbed with empty bodies.
commit f53d7b48676f2b3d2b2062bc12591f9966a8db83
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue May 1 16:07:48 2018 +0100
Rename @DeterministicStub to @NonDeterministicStub.
commit 0c2e7e76587805b72f0270cdbbc067a909abae82
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue May 1 15:57:37 2018 +0100
Consistency fix for JarFilter log messages about methods.
commit 43a5c342c508fcc690a02b94926cf4153b5eb297
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue May 1 13:25:15 2018 +0100
Reorganise determinism unit test.
commit 6079d319d20a6c0cb7386bfcf98b675a73bff040
Author: Chris Rankin <chris.rankin@r3.com>
Date: Mon Apr 30 23:10:23 2018 +0100
Allow file timestamps to be thrown away for reproducible builds.
commit 7068f2fcd46d3f600710ccd9312b9d8dc46f1f38
Author: Chris Rankin <chris.rankin@r3.com>
Date: Mon Apr 30 21:55:26 2018 +0100
Declare PlatformSecureRandom as non-deterministic.
commit 3a5b8eff11a7200f48310408442880967260d80e
Author: Chris Rankin <chris.rankin@r3.com>
Date: Mon Apr 30 17:48:20 2018 +0100
Test deleting property initialisers from <clinit> block.
commit a91f75cf8eb813305adcfd962d8931a1b9322915
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sun Apr 29 23:34:26 2018 +0100
Suppress lots of "UNUSED" warnings for test classes.
commit fb09396f14cb6b2b80e80209091afe370cef15ab
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sun Apr 29 23:10:13 2018 +0100
Add crude test for fixing package metadata.
commit 80a9c794bcbc6cbfb7010285c9e94faa9c17310a
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sun Apr 29 21:45:28 2018 +0100
Refactor GradleRunner code into a JUnit Rule.
commit 5615dd6624991af49ae283beb3dfe1223d0f26f3
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sun Apr 29 00:55:10 2018 +0100
Add JaCoCo support to JarFilter plugin.
commit df55b962aa77f170d4183865743a263d11f061b3
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sat Apr 28 16:48:58 2018 +0100
Allow the executor to iterate the Visitor more than twice.
commit d906e3996b7724528e69fc4abe79c2b59b2f03cb
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sat Apr 28 16:19:52 2018 +0100
Add tests for deleting static properties.
commit f87120efeeb9b6edd129ca71852d1c1bc3fe7e57
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Apr 27 17:34:39 2018 +0100
Ensure that SgxSupport.isInsideEnclave is always true for core-deterministic.
commit 85ff9cb17492ae93f0e4f5bbaa2d935e4d776b13
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Apr 27 14:26:14 2018 +0100
Test deleting field references from constructor byte-code.
commit ac45aa04c60dab71553ddf0ddfc97ecaed6c84af
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Apr 26 22:49:39 2018 +0100
Add tweak to ClassVisitor code.
commit 70bc232592e8739546e3f0cdb90add29b5953cf8
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Apr 26 18:37:55 2018 +0100
Declare more Crypto functionality as Deterministic/NonDeterministic.
commit 6ceb49af6b75e90ce8e6d739ca6b012627ed6128
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Apr 26 15:39:41 2018 +0100
Rewrite constructors not to reference deleted fields.
commit ed1a0e76e68d49531026e130d3c4d4ca56b3e06d
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Apr 26 09:48:38 2018 +0100
Configure ASM to compute max stack and locals automatically.
commit 0c1a789bf0824b8a18c57a04f4428c678864b76d
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Apr 25 17:30:52 2018 +0100
Add isConstructor property to MethodElement.
commit acd640db52b2b1051c67067c30414d2035c9d064
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Apr 25 14:59:33 2018 +0100
Add test cases for deleting singleton objects.
commit 1a1b79ee13f993dd9cfc9ab8f570e96a5f2e3530
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Apr 25 12:18:49 2018 +0100
Extend JarFilter to delete lazy properties.
commit acea7942ad85107e0deec6bef1a0c9d88329b9c4
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue Apr 24 16:04:48 2018 +0100
Remove functions for measuring elapsed time.
commit 03cc5c53b5b220ceccf43b0a3a218e84055a2f17
Author: Chris Rankin <chris.rankin@r3.com>
Date: Mon Apr 23 18:29:47 2018 +0100
Modify MetaFixer task to remove deleted nested classes.
commit 281c5c06b69fe4bbc28d41aa46c3cf4b6c625877
Author: Chris Rankin <chris.rankin@r3.com>
Date: Mon Apr 23 15:02:54 2018 +0100
Removing dangling references to deleted nested classes.
commit 8bd44ab76dca21b1198db37a1e574538f99c2555
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sun Apr 22 20:15:00 2018 +0100
Refactor StubbingMethodAdapter to rewrite remaining annotations.
commit 59f7392155fe79c9017af563c4705ef5f486dd6b
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sun Apr 22 01:14:59 2018 +0100
Small tidy-up of property tests.
commit 7696708ddf3370b13ff5ea2727b2e03380792098
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sun Apr 22 00:53:28 2018 +0100
Test backing field when deleting a property.
commit 083d7678ea73fde03be62d1b845654b9ec9c0c9a
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sun Apr 22 00:40:45 2018 +0100
Refactor isFunction() and isConstructor() for Kotlin reflection.
commit cbb5bc30d9fb991d12a8c3775e715b49a2c13abd
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sun Apr 22 00:33:11 2018 +0100
Ensure that stubbed out functions keep their annotations.
commit 14947aa105cb7c336b6a7cffa875b6add8000c5d
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sat Apr 21 16:11:33 2018 +0100
Test JarFilter interactions between deleting and stubbing out.
commit 2d2a944f56268a697d110923a73589bf71145011
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Apr 20 16:59:40 2018 +0100
Annotate more core classes as @Deterministic.
commit a23382ff1930747fa55497fcd8c18e00bf980d4f
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Apr 20 15:48:49 2018 +0100
Extend JarFilter unit test coverage.
commit af0d3b32c85e23fb7a6c6e9a0639cc0d22a7213f
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Apr 20 14:49:56 2018 +0100
Enhance JarFilter - also delete methods that use deleted methods/fields.
commit e6cd87e73b5509656faa6879ab8057690c8450ad
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Apr 19 18:40:30 2018 +0100
Upgrade AssertJ to 3.9.1
commit ab217563de2cb60a690221d1d497247d04486060
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Apr 19 18:20:54 2018 +0100
Add unit tests for the metadata-fixing task.
commit ddff9a10e8aa6dae81b597ff757edee0125d663f
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Apr 19 09:01:25 2018 +0100
Refactor Hamcrest matchers into a separate package.
commit afa3f5a825f8127bec262ff0a7ece5af1e0c6dfb
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Apr 18 23:15:05 2018 +0100
Add unit tests for MethodElement and FieldElement.
commit dd412756bc99ff46083558e6863498ae1493a4b7
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Apr 18 17:06:42 2018 +0100
Declare exception and MerkleTree classes as deterministic.
commit ce732d2cfb17a8f70a4bc71ccad4d75e68e240c7
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Apr 18 16:04:33 2018 +0100
Never remove @JvmField properties from companion objects when fixing metadata.
commit c2a5b35b351480c637dc023c07043243b7f16ee5
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Apr 18 10:37:28 2018 +0100
Rename MetaFix* classes to MetaFixer*.
commit 358916bef7eb9955f3fc7cea9ab08286ab153564
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue Apr 17 16:21:10 2018 +0100
Extend JarFilter to remove getters/setters along with properties.
commit 0c96a154b89244cdc93c53563aacd40b019182d4
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue Apr 17 13:11:29 2018 +0100
Extend JarFilter tests for deleting properties.
commit bb63fbacbd46e93eb2dbecca21161968d11fc59e
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue Apr 17 12:28:37 2018 +0100
Fix determination of CordaException.
commit cb92d47643e1a9c41267e548fc79d077da941b28
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue Apr 17 12:25:06 2018 +0100
Refactor JarFilter - support deleting @JvmField properties.
commit 349b1a7fe9bec140e1f988e104ec44a8e65745c6
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Apr 13 17:32:07 2018 +0100
Preliminary Gradle task to remove missing elements from @Metadata.
commit f4564e6661458a317f2ebf0e8ce0fbdeae5e1c30
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue Apr 3 20:46:41 2018 +0100
Upgrade to ProGuard 6.0.2
commit c937109398c242bb09d0157cec8debded6012a1b
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 29 12:04:52 2018 +0100
Refactor internal Kotlin dependencies into MetadataTransformer.
commit 899a315a2684986249c88f647784f88235205530
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 29 09:48:05 2018 +0100
Upgrade to ASM 6.1.1.
commit 592e1ced7d36f0838c634cb413af9d0b4b8b516b
Author: Chris Rankin <chris.rankin@r3.com>
Date: Sat Mar 24 13:37:17 2018 +0000
Remove unwanted Kotlin artifacts from the JarFilter's classpath.
commit 4591d54c247fc9937f202306e2a5ec872fb2dbea
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Mar 23 10:04:49 2018 +0000
Tidy up output from Kotlin reflection matchers.
commit fb78d898ef1428210bbb030f43b9a2024f1fdeb1
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Mar 23 09:42:38 2018 +0000
Remove lateinit field from ClassTransformer.
commit c08ecb2139550ea1bc6ab6cebb3ab180e037c40a
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 22 18:25:54 2018 +0000
Remove non-deterministic DelegatingSecureRandom* classes from core-deterministic.
commit 7c3e8e794ec868ff4385661ff68081f2bc5ba09c
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 22 18:24:48 2018 +0000
Stop removing @kotlin.Metadata annotations from core-deterministic.
commit 16ce8ceee91793efb8a100e29d1770f23cf02643
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 22 15:42:58 2018 +0000
Add (C) headers for new files.
commit 6146b0b47d9e9f46873506711cbef60477aea655
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 22 12:43:43 2018 +0000
Log synthetic classes, but do not adjust @Metadata.
commit 016b2be942533790413e28d50d6dc8b104a4de5c
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 22 12:08:36 2018 +0000
Add @Metadata support for Kotlin multi-file classes.
commit 9eeed582a083c34a0580f1049cad42d7dc8812a1
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 22 10:38:09 2018 +0000
Add JarFilter unit tests for @kotlin.Metadata updates.
commit eb71cb3d76a45fa15eedf478e6172e33a8127305
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Mar 21 15:29:01 2018 +0000
Update JarFilter plugin to remove references to deleted constructors, functions and fields from @kotlin.Metadata.
commit c28c099546dd24ab6f158b633e494948fabb6b5e
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 15 18:27:06 2018 +0000
Tidy up Enclavelet tests slightly.
commit 895dfe659b9ffa6e39b407606876facc153e3128
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 15 18:25:14 2018 +0000
Annotate more Attachment / Transaction classes as @Deterministic.
commit f5ab283d09a803b9e2e0f465841cd072e9a7040f
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 15 14:21:51 2018 +0000
Upgrade to ProGuard 6.0.1
commit c7717cc0106f39fec822bce8fbbcf18a75a25c2d
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 15 11:11:34 2018 +0000
Adjust LedgerTransaction to remove ClassLoader references when deterministic.
commit 5b37fe9f3f716944f2eb3952870d2e9548dc144d
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Mar 14 16:28:41 2018 +0000
Extra testing for deterministic SecureHash.
commit 01be61676edddf28d4b16a75cff1dd5fe2079c03
Author: Chris Rankin <chris.rankin@r3.com>
Date: Mon Mar 12 16:32:05 2018 +0000
Keep synthetic methods for Kotlin classes.
commit cb01f28089c94457c0498802741dcc742a52eaac
Author: Chris Rankin <chris.rankin@r3.com>
Date: Mon Mar 12 14:35:17 2018 +0000
Add libraries to core-deterministic's runtimeArtifacts configuration.
commit c23ad307596c07a608d6ce3e600fe1b0aee94ef1
Author: Chris Rankin <chris.rankin@r3.com>
Date: Mon Mar 12 11:20:35 2018 +0000
Check that JarFilter's different annotations are all distinct.
commit 4b84451f9d124cba75bb4a1984b9a9d9f60efd17
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Mar 9 17:01:15 2018 +0000
Update the JarFilter plugin to remove some annotations.
This is for stripping @kotlin.Metadata from deterministic classes.
commit 72c4740ffdd5fcb9a7828a1324f6632747fe3115
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Mar 9 14:11:16 2018 +0000
Configure ProGuard to preverify the deterministic JAR.
commit 9fce4724ac3e1cb80f89d38f63a28b39585dfbf9
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Mar 9 14:09:33 2018 +0000
Update to corda-gradle-plugins 4.0.7-SNAPSHOT.
commit fc46624ea2f1c862c9b2a2064a9007ffdc1b94d8
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 8 18:08:20 2018 +0000
Allow core-deterministic artifact to be tested and published.
commit 238814ad2d94dd74fd7cbae7dc3b4d1016697850
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Mar 8 14:54:27 2018 +0000
Since Kotlin 1.2.x, Kotlin artifact dependencies match Kotlin plugin version by default.
commit f81b3772b598995d0df0519512ae1c6b1d4d238b
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Mar 7 13:46:41 2018 +0000
Update KDoc for @Deterministic annotation.
commit 7a1b0fbe6540958bbc743981a3ba724f0f22ef80
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Mar 7 12:27:22 2018 +0000
Add (C) headers for JarFilter and deterministic core.
commit 0add901e55a23c898da7c6a3ec0c4273d7555441
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Mar 7 09:30:38 2018 +0000
Refactor function name for compatibility with corda-gradle-plugins.
commit f37a73dea8969a82ceda48072cb7d393c05a44c7
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue Mar 6 13:57:58 2018 +0000
Include more contract states in core-deterministic.
commit b2eeb08be90fa1a0739854d0c393a23b8c49aed0
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue Mar 6 11:18:53 2018 +0000
Remove synchronized section from deterministic ToggleField.
commit 353257e6a04de1447c674f43989e2fc8aecc807a
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Mar 2 15:24:46 2018 +0000
Extend @NonDeterministic also to target JVM fields.
commit 9dc940c4f9ae8e29e043cdf93634d072373eb030
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Mar 2 15:21:03 2018 +0000
Add tests for deleting field.
commit 2bf43957ed656c419cbf1a0a0ba48b755b8e8ac9
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Mar 2 14:16:33 2018 +0000
Tidy up Kotlin lambdas.
commit 45dc150cfc0b7090816036a4f4f3ce7ae5cde79b
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Mar 2 10:27:57 2018 +0000
Set 'gradle.user.home' for test-kit's GradleRunner. This allows
it to share the project's module cache, which means that it doesn't
need to download its own copy of Kotlin over the Internet.
commit d79ffd0b44cc890dc8e0f513e5d5baaeaddb5d50
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Mar 2 00:41:00 2018 +0000
Remove settings.gradle from tests - it was not the solution.
commit b30fdcd4c2b44370294ae78699b1424e817b13de
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Mar 2 00:28:42 2018 +0000
Create plugin descriptor using java-gradle-plugin.
commit a9e7cbe51e5d3f0d8efea0501ef4858fd3511cd0
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Feb 28 16:55:53 2018 +0000
Resolve simple compiler warning.
commit d247524090539a0d708d383f25e9539a6e6ee809
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Feb 28 16:03:19 2018 +0000
Add local settings.gradle for all unit tests.
commit 031411c71fda98511f9fba6c763cb6d3f74d95eb
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Feb 28 13:58:06 2018 +0000
Add test filtering interface functions.
commit dcc6055ae01fb9e98bea73befe7a5cf473e27590
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Feb 28 13:45:25 2018 +0000
Add test for filtering abstract functions.
commit 0c084f96aa4cbf7173f633dd1d4fa6e633cea6a7
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Feb 28 11:26:27 2018 +0000
Add tests for stubbing static functions out.
commit 3412e3479f09f36e34a33bbd7564bd95b4bbd017
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Feb 28 11:13:35 2018 +0000
Add tests for deleting static functions.
commit 5d8ce9ce1edbee0020595af99c20268de8c38c5f
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Feb 28 10:50:03 2018 +0000
Add test for stubbing out a var property.
commit dea60c8252b0bc849845fdeecc28f67817ef77d8
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Feb 28 10:41:13 2018 +0000
Add test for stubbing a val property out.
commit c69de1b904b496fe146e91eb7e6d138171528b1a
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Feb 28 10:28:13 2018 +0000
Add tests for stubbing constructors out.
commit 1f791cf6013700689e38b129460eba1d20dc5efa
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Feb 28 00:35:23 2018 +0000
Add tests for deleting constructors.
commit 55790a8abb3dba50b4a136760c9a21dc1bd214ca
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue Feb 27 18:37:51 2018 +0000
Add (and fix) test for stubbing a function out.
commit 1f03202197a9e1fe9023848869e0273a05eef3dc
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue Feb 27 13:09:55 2018 +0000
Refactor buildSrc into a multi-module project.
commit 4c937580f40753408b6f29cfc72741b412e4ed3e
Author: Chris Rankin <chris.rankin@r3.com>
Date: Mon Feb 26 17:15:50 2018 +0000
Initial unit testing framework for JarFilter plugin.
commit 45afcaa082cb3f7223d42458a28af14c7c02d611
Author: Chris Rankin <chris.rankin@r3.com>
Date: Fri Feb 23 12:32:04 2018 +0000
Allow some methods to be stubbed out instead of deleted.
commit c5911ec643739369e138a5b451cafa7c067c4134
Author: Chris Rankin <chris.rankin@r3.com>
Date: Thu Feb 22 10:31:18 2018 +0000
ENT-1468: Initial version of the JarFilterTask.
* Refactor deterministic test data to work on Windows.
* Fix JarFilter unit tests on Windows.
* Upgrade JarFilter to ASM 6.2
* Allow core-deterministic, serialization-deterministic to be published to Artifactory.
* Share repository configuration between all JarFilter unit tests.
* Small fixes after review.
* Ensure core-deterministic and serialization-deterministic are published with their dependencies.
* Fix logic for number of JarFilter passes.
* Add README for JarFilter plugin.
* Move JarFilter plugin into the 'net.corda.plugins' namespace.
* Modify JarFilter to update sealed subclasses in @kotlin.Metadata.
* Add Gradle fixes from @Clintonio.
* Annotate TransientClassWhitelist as deterministic.
* Add literalinclude blocks to the deterministic-module docs.
* Fix Kotlin Metadata properly when all nested classes are deleted.
* Small tidy-up for Gradle files.
* Add some KDoc for the JarFilter and deterministic classes.
* Update JarFilter to handle properties with generic return types.
* Remove some uses of Java Reflection from DJVM.
* Rename determinism annotations to @KeepForDJVM, @DeleteForDJVM, @StubOutForDJVM.
Apparently, if incorrect endpoint provided, ActiveMQNotConnectedException is thrown
which is different to ActiveMQSecurityException. Extend catch block to: ActiveMQException
to cater for all such cases.
This fixes an issue for pojos with getters that aren't c'tor-based properties. Jackson serialises these out but is then unable to deserialise the pojo back.
node-api now depends on this module and upcoming changes will use this as well rather than having to depend on node-api.
EnumEvolveTests.deserializeWithRename and EnumEvolveTests.multiOperations are temporarily ignored since their test resources can't be regenerated due to bugs.
It's no longer used as we've switched over to AMQP for RPC calls so
remove it from everywhere and only use it for checkpointing
* Wire up demo bench post Kryo removal
* Test Fixes
* rebase and fix tests
* Test Fix
* wip
* revert changes to api now we don't need to add annotations
* Client and server support for amqp
* Observable (and supporting) serialisers
Unit Tests
* Fixing tests
* Test fixes
* CORDA-847 - Update api doc with additon of @CordaSerializable annotation
* TestFixes
* review comments
* TestFixes
* Test Fix
* Test Fix
* Test Fix
* Test Fix
* Test Fix
* Test Fix
* TestFix
* Test Fix
* Review Comments
SerializedBytes are first converted to the object it represents before being serialised as a pojo.
These changes will be needed to support the the blob inspector when it will output to YAML/JSON.
* CORDA-1393: Install `onError()` handler for folding action
or else `ErrorNotImplementedAction` will be invoked which is never a good thing
* CORDA-1335: Improve exception handling in `cleanUpOnConnectionLoss()`
* CORDA-1335: Try to trick the logic to pretend we are running in HA mode to have a chance of re-connecting.
* CORDA-1416: Make `NodeMonitorModel` code react to proxy changing.
* CORDA-1416: Workaround `CordaRPCOps.equals()` calls when listener dispatching change.
* CORDA-1416: Increase re-try interval to allow enough time for server to come back online.
* CORDA-1355: Properly close RPC connection we are moving away from.
* CORDA-1355: Unsubscribe on Error to prevent propagation of it downstream.
* CORDA-1355: For downstream subscribers ignore errors properly. Thanka to @exfalso for the hint.
This fixes: Transaction Updates do not flow after re-connect
* CORDA-1355: Bugfix eliminate duplicating items on "Transactions" blotter after re-connect.
* CORDA-1355: Bugfix eliminate double counting on dashboards.
* CORDA-1355: Bugfix eliminate same parties in dropdowns.
* CORDA-1355: Stop using `SecureHash.randomSHA256()` for painting widget icon.
Instead use combined SHA hash such that icon represents the whole population of trades.
That way two transactions blotters can be compared by a single glimpse at corresponding icons.
Also minor refactoring.
* CORDA-1416: Make RPC re-connection faster/more robust.
* CORDA-1416: Properly announce thet Proxy may not be available during re-connect and prevent UI crashing.
* CORDA-1416: Disable UI until RPC proxy is available.
* CORDA-1416: Correct typo.
* CORDA-1416: Unit test fix.
* CORDA-1416: GUI cosmetic changes.
* CORDA-1416: Correct spaces.
* CORDA-1416: Remove un-necessary overrides in CordaRPCOpsWrapper.
* CORDA-1416: Switch from using `doOnError` to installing an error handler upon subscription.
* ENT-1670: update kdocs and unit test for better user experience regarding
RPC connection loss
* RPCStabilityTests: move doOnError logic to onError handler
Prior to this change it was intermittently failing with:
```
net.corda.client.rpc.RPCException: RPC server is not available.
at net.corda.client.rpc.internal.RPCClientProxyHandler.invoke(RPCClientProxyHandler.kt:222)
at com.sun.proxy.$Proxy79.ping(Unknown Source)
at net.corda.client.rpc.RPCStabilityTests$client reconnects to rebooted server$1$pingFuture$1.invoke(RPCStabilityTests.kt:251)
at net.corda.client.rpc.RPCStabilityTests$client reconnects to rebooted server$1$pingFuture$1.invoke(RPCStabilityTests.kt:36)
at net.corda.core.internal.concurrent.ValueOrException$DefaultImpls.capture(CordaFutureImpl.kt:107)
at net.corda.core.internal.concurrent.OpenFuture$DefaultImpls.capture(CordaFutureImpl.kt:65535)
at net.corda.core.internal.concurrent.CordaFutureImpl.capture(CordaFutureImpl.kt:119)
at net.corda.core.internal.concurrent.CordaFutureImplKt$fork$$inlined$also$lambda$1.run(CordaFutureImpl.kt:22)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:748)
```
* Improve error reporting in case of failure of flaky tests
Also eliminate warnings and other minor changes.
* Address code review comments raised by @exFalso
Also improve output for stack traces.
* rework message handling while connection is down: do not send anything, throw on all obs and futures when failure detected
* RPC calls will throw if used during failover; adapted tests
* CORDA-296: added handler for connection failover
print rpc address during node startup
* address PR comments: typo, whitespace, onError observables
* reworked rpc client msg buffering to avoid race conditions when failure happens while the request is being prepared to be sent; added unit test for 8 threads sharing same client sending 1000 requests
* decreased sleep time in rpc test, code cleanup
- Existing embedded Shell connects via RPC including checking RPC user credentials (before was a direct use of CordaRPCOps): in dev mode when console terminal is enabled, node created `shell` user.
- New Standalone Shell app with the same functionalities as Shell: connects to a node via RPC Client, can use SSL and run SSH server.
* CORDA-986 and CORDA-985 CompositeKey and Signature verification performance fixes (#2467)
* CORDA-696: Create separate transaction types for contract upgrade transactions.
Add rationale around upgrade transactions
Move contract upgrade transaction resolution logic into internal until it's stabilised.
Throw a better exception when contract attachment not found
Default legacy contract constraint to always accepting - needs to be changed to whitelist constraint before merging
Introduce a new upgraded contract interface that allows specifying the legacy constraint.
Remove StateLoader, make all tx resolution functions take in ServicesForResolution
Contract upgrade transactions can handle whitelist by zone constraints
When creating a contract upgrade transaction, make sure the attachment of the old cordapp gets attached when using hash constraints.
Attachment lookup for a given contract class name only scans currently loaded cordapps, and we don't load old versions of cordapps.
CORDA-696: Update upgrade docs
Also for "client/rpc" explicitly specify "jvmTarget" (similar to what "experimental/behave" does) to avoid ambiguity.
Without this change the following compilation error been observed in IntelliJ:
Z:\corda\experimental\behave\src\main\kotlin\net\corda\behave\node\Node.kt
Error:(163, 44) Kotlin: Cannot inline bytecode built with JVM target 1.8 into bytecode that is being built with JVM target 1.6. Please specify proper '-jvm-target' option
* Remove sslConfiguration from public constructor of CordaRPCClient
* Address review comments
* Update api-current.txt
* sslConfiguration doesn't need to be a property
* Don't expose StartedNode via Node Driver
* Dont expose StartedNode/Abstract Node via MockNetwork
* Remove internal var from constructor as it doesn't hide from public api and change to internal initialisation method
* Update api
* Rename MockNode to StartedMockNode to avoid confusion
Update documentation
Update api-current.txt
* Fix typo
* Fix test failure
* Modify flow tests to use internal mock network and remove additional internal exposures from StartedMockNode
* Fix api-current
* Change InProcess and OutOfProcess to interfaces
* Explicitly declare MockNetwork parameters
Dont expose StateMachineManager
Move affected tests to use internal mock network
* Fix api-current
* Changes requested via review
* Fix IRS Demo address
* Fix api
* Remove internal attribute from classes in internal package
* Remove accidentally added code
* Move useHttps into NodeHandleInternal
* Remove duplicated code
* Update api-current
* Make webAddress internal on NodeHandle
* Make sure parameters in public api are explicitly specified
* Use correct address in IRS Demo
* Get webaddress from webserver handle
* Update api-current
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)
* Align CordaRPCJavaClientTest with Kotlin version of the test ((byte)0 instead of "1".getBytes())
* Refactoring to align with enterprise repo (exceptions).
* Able to send hand coded messages to an Artemis node inbox
Get startup race condition fixed. Start cleanup work.
Fixup after rebase
Remove SASL hack for now
Minor tweaks. Enable AMQP mode manually.
Add configuration control
Slight clean up
Stop timeouts that don't work with AMQP
Rename class
Get TLS constants from :node-api
Primitive integration test
Put back commented line
Session per bridge to alow rollback on remote rejects.
Add more tests and handle multiple IP adddresses
Reduce logging
Fixup after rebase
Add a test to verify the remote end AMQP rejection logic works and does cause message replay.
Allow Artemis to duplicate after session rollback
Reduce number of threads
Move legacy bridge related code over to CoreBridgeManager
Shared threadpool for bridges
Add a test to confirm that no side effects when using a shared thread pool.
Address PR comments and remove dead lines
Rebase and add some comments
Remove a couple of blank lines
Ensure AMQP bridges are used in tests
Fixup after removal of testNodeConfiguration
Add a couple of doc comments
Add a couple of doc comments
Make things internal and use CordaFuture
Address some PR comments
Change comment type
* Use Artemis 2.2 to fix AMQP problems. Add explicit test of legacy core bridges, as marking the factory class private had silently broken them.
* Fix change due to using Artemis 2.2
* Extend unit test on RPCSecurityManager
* Fix corner cases in permission parsing and bug in tryAuthenticate
* Rework docsite page
* Add missing ChangeLog entry
* Add support for external data source of access control data (RPC/Shell users credential and permissions), with optional in-memory caching.
* Support password encoded with Apache Shiro fully reversible Modular Crypt Format.
* Introduce 'security' field in Node configuration and related docsite page.
* Revert "CORDA-296: added rpc that returns an observable for node state (#2004)"
This reverts commit 7d1f7ab
* Revert "CORDA-296: added rpc that returns an observable for node state (#2004)"
This reverts commit 7d1f7ab
* CORDA-296: added rpc that returns an observable for node state; used to let rpc clients know that the know is about to shut down
* replaced node shut down observation String with enum
* Extracted out ShutdownManager into its own file
* Moved RPCDriver and ProcessUtilities into internal package
* Made n.c.testing.performance package internal
network-parameters file read in by the node at startup, of which only the list of notaries is used. For now, the driver and MockNetwork have been updated to require notaries to be started first. This is so that the same set of network parameters can be defined for all the nodes.
CN in the legal name is not longer disallowed since it's no longer reserved for distributed notary names.
Single-node notaries now only have one identity, their main identity. Nodes part of a cluster continue to have two.
(Based off Kasia's work)
Or else NodeExplorer will not start due to exception:
java.lang.ClassCastException: net.corda.core.contracts.StateAndRef cannot be cast to java.lang.Void
at net.corda.client.jfx.model.ContractStateModel$Companion.filterCashStateAndRefs(ContractStateModel.kt:43)
at net.corda.client.jfx.model.ContractStateModel$Companion.access$filterCashStateAndRefs(ContractStateModel.kt:38)
at net.corda.client.jfx.model.ContractStateModel$cashStatesDiff$1.call(ContractStateModel.kt:29)
at net.corda.client.jfx.model.ContractStateModel$cashStatesDiff$1.call(ContractStateModel.kt:22)
at rx.internal.operators.OnSubscribeMap$MapSubscriber.onNext(OnSubscribeMap.java:69)
at rx.internal.operators.OnSubscribeMap$MapSubscriber.onNext(OnSubscribeMap.java:77)
at rx.subjects.PublishSubject$PublishSubjectProducer.onNext(PublishSubject.java:304)
at rx.subjects.PublishSubject$PublishSubjectState.onNext(PublishSubject.java:219)
at rx.subjects.PublishSubject.onNext(PublishSubject.java:72)
* CORDA-351: force update dependencies and suppress vulnerabilities not affecting corda
* CORDA-351: force update dependencies and suppress vulnerabilities not affecting corda
* Enhance the API Scanner plugin to monitor class annotations.
* Implement @DoNotImplement annotation, and apply it.
* Update API definition.
* Update API change detection to handle @DoNotImplement.
* Document the `@DoNotImplement` annotation.
* [CORDA-442] let Driver run without network map
- Nodes started by driver run without a networkMapNode.
- Driver does not take a networkMapStartStrategy anymore
- a new parameter in the configuration "noNetworkMapServiceMode" allows for a node not to be a networkMapNode nor to connect to one.
- Driver now waits for each node to write its own NodeInfo file to disk and then copies it into each other node.
- When driver starts a node N, it waits for every node to be have N nodes in their network map.
Note: the code to copy around the NodeInfo files was already in DemoBench, the NodeInfoFilesCopier class was just moved from DemoBench into core (I'm very open to core not being the best place, please advise)
* Remove local function because it is serialised as a lambda.
* Don't automatically whitelist Kotlin lambdas unless checkpointing.
* Add comment to @CordaSerializable, warning not to allow AnnotationTarget.EXPRESSION.
* Updated corda release version to 1.0.0.RC2 (#1641)
* Fixed Simm Valuation Demo Test and enable serializabe java 8 lambdas. (#1655)
* [CORDA-624] Node Explorer on Issuing cash throws MissingContractAttachements exception (#1656)
(cherry picked from commit 27fea4d)
* BIGINT fix for H2 coin selection. (#1658)
* BIGINT fix for H2 coin selection.
* Review feedback
* CORDA-637 Node Explorer shows Network Map Service in Cash Issue dropdown (#1665)
* [CORDA-637] Node Explorer shows Network Map Service in Cash Issue dropdown
* add TODO to remove the hack
* Declare this internal message string as "const". (#1676)
* Merge "A variety of small fixes" into the 1.0 release branch (#1673)
* Minor: improve javadocs in NodeInfo
* Minor: use package descriptions in Kotlin build of api docs too, not just javadocs.
* RPC: make RPCConnection non-internal, as it's a core API. Move docs around so they're on public API not internal API.
* Add an IntelliJ scope that covers the currently supported Corda API.
This is useful when used in combination with the "Highlight public
declarations with missing KDoc" inspection.
* Ironic: upgrade the version of the Gradle plugin that checks for upgraded versions of things.
It had broken due being incompatible with the new versions of Gradle
itself.
* Docs: flesh out javadocs on ServiceHub
* Docs: add @suppress to a few things that were polluting the Dokka docs.
* Docs: mention RPC access in NodeInfo javadoc
* IRS Fixes to bring UI closer to declared financial types (#1662)
* Made problematic CordaRPCClient c'tor private (with internal bridge methods) and added correct c'tors for public use. (#1653)
initialiseSerialization param has also been removed.
* Fixing flow snapshot feature (#1685)
* Fix validating notary flow to handle notary change transactions properly. (#1687)
Add a notary change test for checking longer chains involving both regular and notary change transactions.
* Unification of VaultQuery And VaultService APIs (into single VaultService interface) to simplify node bootstrapping and usability. (#1677) (#1688)
* Identity documentation (#1620)
* Sketch initial identity docs
* Restructure confidential identity docs to better fit structure
* Split confidential identities into API and concepts
* Further expansion on basic identity conceptS
* Merge Party type into api-identity.rst
* Address feedback on written content
* Rework inline code with literalinclude
* Start addressing feedback from Richard
* Clarify use of "counterparty"
* Address comments on key concepts
* Correct back to US english
* Clarify distribution/publishing of identities
* Update changelog around confidential identities
* CORDA-642 Notary demo documentation fixes (#1682)
* Notary demo documentation fixes.
* One of the tables is prefixed.
* CORDA-641: A temporary fix for contract upgrade transactions (#1700)
* A temporary fix for contract upgrade transactions:
during LedgerTransaction verification run the right logic based on whether
it contains the UpgradeCommand.
* Move ContractUpgradeFlowTest away from createSomeNodes()
* Remove assembleBareTx as it's not used
* Update corda version tag to 1.0.0-RC3 (#1705)
* Hide SerializationContext from public API on TransactionBuilder (#1707)
* Hide SerializationContext from public API on TransactionBuilder
(cherry picked from commit 6ff7b7e)
* Hide SerializationContext from public API on TransactionBuilder
(cherry picked from commit 6ff7b7e)
* Address feedback on confidential identities docs (#1701)
* Address minor comments on confidential identities docs
* Expand on implementation details of confidential identities
* Cleanup
* Clarify details of the data blob in the swap identites flow
* Add that certificate path is not made public for confidential identities
* FlowSession docs (#1693)
* FlowSession docs (#1660)
* FlowSession docs
* PR comments
* Milder example flow name
* Fixes bugs with contract constraints (#1696)
* Added schedulable flows to cordapp scanning
Fixed a bug where the core flows are included in every cordapp. Added a test to prove the scheduled flows are loaded correctly. Added scheduled flow support to cordapp.
Renabled broken test.
Fixed test to prove cordapps aren't retreived from network.
Review fixes.
Fixed a test issue caused by gradle having slightly different paths to IntelliJ
* Fixed test for real this time.
* Consistent use of CordaException and CordaRuntimeException (#1710)
* Custom exceptions in corda, should either derive from an appropriate closely related java exception, or CordaException, or CordaRuntimeException. They should not inherit just from Exception, or RuntimeException.
Handle PR comments
Add nicer constructors to CordaException and CordaRuntimeException
* Fix ambiguous defaulted constructor
* Add @suppress (#1725)
* Git-ignore Node Explorer config. (#1709)
* add message warning windows users they might need to manually kill explorer demo nodes started by gradle (#1717) (#1726)
* Misc documentation fixes (#1694)
(cherry picked from commit 592896f)
* Document -parameters compiler arg for Java CorDapps. (#1712)
* Correct non-anonymous two party trade flow (#1731)
* Parameterize TwoPartyTradeFlowTests to confirm deanonymised functionality works.
* Correct handling of counterparty using well known identity in TWoPartyTradeFlow
* CORDA-594 - SIMM Demo doc update (#1723) (#1735)
* CORDA-594 - SIMM Demo doc update
For V1 write a series of JSON / curl commands a user can follow to run
the demo
* Review Comments
* Updated the rationale behind as to why SIMM was introduced.
* typo
* Cordapps now have a name field. (#1664)
Corrected cordapp name generation.
Added changelog entry.
* Small API fixes against M16 (#1737)
* Move CompositeSignaturesWithKeys into net.corda.core.crypto package.
(cherry picked from commit 8f29562)
* Rename and move CordaPluginRegistry to reflect its real purpose now.
Simplify serialization code a bit.
(cherry picked from commit e2ecd3a)
* Docs: docsite improvements
* Remove discussion of webserver from 'writing a cordapp' page.
* Fixup some flow docs.
* Add a couple more package descriptions.
(cherry picked from commit 2aedc43)
* Review comments
(cherry picked from commit ba1d007)
* Review comments - always apply default whitelist and no longer load it via ServiceLoader
(cherry picked from commit 7d4d7bb)
* Added wording about renaming services resource file
* Update corda version tag to 1.0.0-RC4 (#1734)
* Update corda version tag to 1.0.0-RC3
* Update corda version tag to 1.0.0-RC4
* Update build.gradle
* V1 tests and fixes for the ContractConstraints work (#1739)
* V1 tests and fixes for the ContractConstraints work
* More fixes.
* Added a contract constraints section to the key concepts doc. (#1704)
Documentation for contract constraints.
Added to index.
Review fixes round 1.
More review fixes.
Review fixes.
Explained package contents.
review fixes.
Addressed RGB's final review comments.
Updated source code type to 'java'
* Fixes dead links. (#1749)
* Update gradle plugins version to 1.0.0 (#1753)
* Update Readme (#1756)
* Update Readme
Minor tweaks to Readme -- consistent capitalisation and more descriptive list of features (also reordered to put the important things first)
* Copied master readme.
* Update Readme
Minor tweaks to Readme -- consistent capitalisation and more descriptive list of features (also reordered to put the important things first)
* Fixes .rst formatting. (#1751)
* Updates tutorials. (#1649)
* Updates tutorials.
* Addresses review comments.
* Tutorial refresh for v1.0 and moving of code into separate files. (#1758)
* Moves code sections in tutorials to code files.
* Removes wallet references.
* Updates repo layout doc.
* Removes remaining cordapp-tutorial references, replaced with cordapp-example.
* Fixes broken link.
* Misc docs fixes.
* Refreshes the ServiceHub and rpc ops api pages.
* Updates the cheat sheet.
* Updates cookbooks.
* Refreshes the running-a-notary tutorial.
* Updates flow-testing tutorial
* Updates tear-offs tutorial.
* Refreshes integration-testing tutorial.
* Updates to contract tutorial and accompanying code to bring inline with V1 release.
* Refreshes contract-upgrade tutorial.
* Fixed broken code sample in "writing a contract" and updated contracts dsl.
* Added contract ref to java code. Fixed broken rst markup.
* Updates transaction-building tutorial.
* Updates the client-rpc and flow-state-machines tutorials.
* Updates the oracles tutorial.
* Amended country in X500 names from "UK" to "GB"
* Update FlowCookbook.kt
* Amended cheatsheet. Minor update on contract upgrades tutoraial.
* Added `extraCordappPackagesToScan` to node driver.
* Changes to match new function signature.
* Update to reflect change in location of cash contract name.
* CORDA-670: Correct scanned packages in network visualiser (#1763)
* Add CorDapp dependency of IRS to network visualiser
* Set CorDapp directories
* Checking out the latest milestone will no longer be required. (#1761)
* Updated documentation indices (#1754)
* Update documentation indices.
* Reference a moveable tag for V1 docs.
Remove redundant warning text.
* Reverted proposed usage of new docs release tag
* Minor: print a deprecation warning when the web server starts. (#1767)
* Release and upgrade notes for V1.0 (#1736)
* Release and upgrade notes for V1.0
* Update changelog.rst
* Update changelog.rst
* Formatting.
* Incorporating review feedback from KB and MN.
* "guarantee" instead of "promise"
* Updated with final review comments from KB and RGB.
* Updated upgrade notes to describe migration from removed CordaPluginRegistry.
* Minor clarification.
* Minor updates following final RGB feedback.
* Kat's further pedantic feedback
* Minor changes following feedback from KB.
* Incorporating review feedback from MH.
* killed 'patent-pending'
* Made the visualiser into a regular JVM module - not a CorDapp. (#1771)
* Docs: more package descriptions and take non-stabilised APIs out of the docs build. (#1775)
* Update corda version tag to 1.0.0
* Updated release notes to fix minor typos (#1779)
Fixed bold type on simplified annotation driven scanning bullet and added bold type to module name bullets
* Fixed drop down.. probably. (#1780)
* fixed formatting for release notes. (#1782)
* Improve API page wording (#1784)
* Removed "unreleased" sections from the release notes and change log.
* Merge remote-tracking branch 'origin/release-V1' into colljos-merge-v1-docs
# Conflicts:
# build.gradle
# client/jfx/src/main/kotlin/net/corda/client/jfx/model/NodeMonitorModel.kt
# client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
# client/rpc/src/main/kotlin/net/corda/client/rpc/PermissionException.kt
# constants.properties
# core/src/main/kotlin/net/corda/core/flows/FlowSession.kt
# core/src/test/kotlin/net/corda/core/contracts/DummyContractV2Tests.kt
# core/src/test/kotlin/net/corda/core/flows/ContractUpgradeFlowTest.kt
# docs/source/api-flows.rst
# docs/source/api-index.rst
# docs/source/changelog.rst
# docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/testdsl/CommercialPaperTest.java
# docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/contract/TutorialContract.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/testdsl/TutorialTestDSL.kt
# docs/source/hello-world-state.rst
# docs/source/key-concepts-contract-constraints.rst
# docs/source/serialization.rst
# docs/source/tut-two-party-flow.rst
# docs/source/tutorial-tear-offs.rst
# node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/CordaClassResolver.kt
# node-api/src/test/java/net/corda/nodeapi/internal/serialization/ForbiddenLambdaSerializationTests.java
# node-api/src/test/java/net/corda/nodeapi/internal/serialization/LambdaCheckpointSerializationTest.java
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/test/kotlin/net/corda/node/internal/cordapp/CordappLoaderTest.kt
# node/src/test/kotlin/net/corda/node/services/NotaryChangeTests.kt
# samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/AttachmentDemo.kt
# samples/trader-demo/src/main/kotlin/net/corda/traderdemo/TraderDemo.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/FlowStackSnapshotTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# webserver/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt
* Skeleton plugin.
* Implement Gradle api-scanner plugin, and apply it.
* Generate API documentation for any jar without a classifier.
* Fix usage of smokeTests classifier.
* Tweak Gradle API usage.
* Upgrade to fast-classpath-scanner 2.7.0
* Include interfaces and more modifiers in the class description.
* Allow system classes to be supertypes and implemented interfaces.
* Make API Scanner plugin configuration tweakable via build.gradle.
* Add a miserable amount of unit testing.
* Sort methods and fields using their natural comparators. Way easier!
* Add README for api-scanner plugin.
* Add @OutputFiles to ScanApiTask.
* Rename ScanApiTask to ScanApi.
* Allow the ScanApi task to be disabled.
* WIP: Create a top-level GenerateApi task to collate the ScanApi output.
* Exclude package-private classes, as well as bridge/synthetic methods.
* Replace "End of Class" delimiter with '##'.
* Don't scan modules whose API is still "in flux".
* Include constructors in the API definitions.
* Finish implementation of GenerateApi task.
* Update README to include GenerateApi task.
* Filter out Kotlin's "internal" methods.
* Assign "fatjar" classifier to the fat jar artifact.
* Enhance README for GenerateApi.
* Explain effect of api-scanner plugin, and link to Corda's API strategy.
* Tweak README
* Exclude synthetic Kotlin classes by analysing @Metadata.
* Allow us to exclude some classes explicitly from the API.
Handle PR comments
Add nicer constructors to CordaException and CordaRuntimeException
(cherry picked from commit 89478c8)
Fix ambiguous defaulted constructor
(cherry picked from commit ec9bafe)
Address PR comment
Update a few more custom exceptions
Move Jackson public key encode/decode support away from Kryo serialization format for compactness and to DER format encoded as base64 for compatibility with other systems.
The current use of SSL RPC relies on access to the node's keystore file, and further to that some uses where using the NODE_USER to login on the p2p port.
* Make functions in CompositeSignature static
* Make contract IDs constant
* Remove use of "e.g." which Dokka will take as end of the first sentence
* Move example onto function that it actually works with
* Change comment which refers to comment above it, without any linkage, to directly describe the function
* Move implementation notes out of Dokka comment
* Change contract IDs to constants in companion objects
* Contract constraints and attachment loading
Fix compiler warnings.
Fixed IdentitySyncFlowTests in confidential-identities.
Fixes.
Fix AttachmentClassLoaderTests.
Added a TODO.
Renamed cordapp service.
Fix compilation error in java code.
Fix RaftNotaryServiceTests
Fix AttachmentLoadingTest
Fix DistributedServiceTests and LargeTransactionTests.
Add cordapp packages to Verifier tests.
Refactor DummyContractBackdoor back out of internal package.
Resolve compiler warnings.
Consolidate excluding `isolated` project at top-level.
Fix contract attachment serialisation for remote verifier.
Fix integration tests for client:rpc.
Contract constraints and attachment loading
Fix compiler warnings.
Fixed IdentitySyncFlowTests in confidential-identities.
Fixes.
Fix AttachmentClassLoaderTests.
Added a TODO.
Renamed cordapp service.
Fix compilation error in java code.
Fix example compilation.
Fix RaftNotaryServiceTests
Fix AttachmentLoadingTest
Fix DistributedServiceTests and LargeTransactionTests.
Add cordapp packages to Verifier tests.
Refactor DummyContractBackdoor back out of internal package.
Resolve compiler warnings.
Consolidate excluding `isolated` project at top-level.
Fix integration tests for client:rpc.
Fixed issues with node driver and differing ZIPs.
Review changes.
Refactor GeneratedAttachment into node-api module.
Merge branch 'clint/hash-constraint' of https://github.com/corda/corda into clint/hash-constraint
Fixed compile error following rebase.
wip - test to check that app code isn't loaded from attachments sent over the wire.
Use Kotlin copyTo() rather than Apache's IOUtils.
Fixes
more fixes.
Removing unconstrained output.
More fixes.
Fixed another test.
Added missing plugin definition in net.corda.core.node.CordaPluginRegistry: net.corda.finance.contracts.isolated.IsolatedPlugin
Re-added missing magic string used in unit test.
Remove unused FlowSession variable.
* Review fixes.
* More review fixes.
* Moved Cordapp implementation to an internal package.
* More JVMOverloads.
* WIP
added a helper method to convert ObservableValue<List> to ObservableList
(cherry picked from commit 75306aa)
* Fix for cash explorer after advertising service removal
(cherry picked from commit 59d0278)
* remove unused changes
* address PR issues
* fixup after rebase
* fix CashState name rendering issue
added flow permission to gradle config
* Remove getAnyNotary() from network map API.
Change notaryIdentities() signature to return a Party instead of PartyAndCertificate.
Some API doc updates.
* Minor API doc formatting and typo fix
* Update changelog
* Address comments
* Address comments
* Remove advertisedServices from NodeInfo.
Introduce notaryIdentities in NetworkMapCache, that will be filled in
later from NetworkParameters. Clean up NetworkMapCache API. Expose
notaryIdentities through RPC. For now we assume as temporary solution
that notaries in NetworkMap have to contain "notary" in name.
* Further clean up of NetworkMapCache API
Remve partyNodes. Introduce getAllNodeInfos function
* Remove notaryIdentity from ServiceHub
* Address Shams review comments
* Address Andrius review comments
* Add comments, cleanup
* Fixes
* Address comments
* Yet another commit with comments addressed
* Move ServiceType and ServiceInfo to node-api
Add changelog entry. Address rest of comments.
* Minor comments
* Remove node's main identitiy from NodeInfo.
Preparation for getting rid of services + supporting multiple identities
on the node.
NodeInfo keeps multiple identities as a list. For now the first one is treated as a special one.
Introduced function chooseIdentity in CoreTestUtils as a preparation for proper handling of multiple identities in the future.
Remove legalIdentityKey from ServiceHub, add extension function - chooseIdentity on ServiceHub.
Add `me` field on FlowStateMachineImplemetation, flows should know what the calling identity is.
Remove SERVICES_PREFIX in artemis messaging layer.
* Address minor comments.
* Fixes after rebase.
Remove chooseIdentity from ServiceHub
* Rename me to ourIdentity on FlowLogic
* Fixes after rebase
* Address Ross comments, fixes
* Fix after rebase
* Fix services certificate paths
Apply Patrick's patch.
* Rename CurrencyUtils to Currencies
Rename CurrencyUtils to Currencies to explain why it's not in the finance utils package.
* Correct reference in CordaRPCJavaClientTest
* Remove spurious newline
* Change to using strings in CordformContext; X500Name is an external API dependency we're trying to avoid, X500Principal rearranges the order of the elements in a way we don't want, and trying to put CordaX500Name into Groovy in the time available is impractical. As such having pre-formatted strings used in the Cordform plugin makes most sense right now.
* Remove uses of CordaX500Name.x500
* Remove old X.500 parsing tools
* Move CordaX500Name.x500 into X500NameUtils
* Move X500NameUtils into internal
* Improved support for testing custom schemas using a MockNetwork.
* Removed `requiredSchemas` from CordaPluginREgistry configuration
Custom schema registration now uses classpath scanning (CorDapps) and explicit registration (tests) following same mechanisms as flow registration.
* Updated following PR review feedback.
* Helper function to return Kotlin object instance fixed and moved to core InternalUtils class.
* Fixed auto-scanning Unit test to assert correct registration of custom schema.
* cleanup comment.
* Changes following rebase from master.
* Enabled confidential identities in:
** IssuerFlow
** Trader demo
** Two party deal flows
** Two party trade flows
** Corda RPC tests
** Cash flows
** Integration testing tutorial
** Node monitor model tests
** CollectSignatureFlow
* Relay local node's confidential identities to counterparties when requesting transaction
signatures, so counterparties know where the inputs come from.
* Require all identities are known in finality flow
* Ensure all identities in FxTransactionBuildTutorial are known to each other
* Add flow for syncing identities to a number of counterparties
* Address PR comments
* Disable anonymisation in example code
* Revert unnecessary changes remaining from earlier rebases
* Corrections after rebase
* Remove unneeded identity registration
Remove unneeded identity registrations from tests, which sometimes cause duplicated entries in the database
* Revert accidental change in examples
* Revert unneeded imports
* Revert changes to CoreFlowHandlers.kt
* Move JavaFX Models functions into Models so that there isn't an empty ModelsKt class generated
for Java interop.
* Move Models functions into their own file as pushing them into the Models class requires significant changes to the Explorer.
* Remove unneeded identity registrations from tests, which sometimes cause duplicated entries in the database
* Add JvmName annotations to ObservableFold and ObservableUtilities
* Move createMapChange() into ReadOnlyBackedObservableMapBase as the only place it's used, to
improve Java interop.
* Clean up Generator by moving extension functions into the class/companion class.
* Add documentation to the actual functions rather than being only on the top level class.
* Add JvmName to Generators
* Move extension functions into the classes they're used in to try supressing generation of empty RPCClientProxyHandlerKt class.
* Add JvmName to ConcurrencyUtils
* Move Iterable<ServiceInfo>.containsType() into Simulation, as it's only useful when verifying
setup of a simulated case. Resolves ServiceInfoKt class being generated.
* Move FlowHandle.notUsed() into the one place it's actually called, so Kotlin stops creating a FlowHandleKt class.
* Rename KeyFactory to CompositeKeyFactory
* Move expandedCompositeKeys into TestDSL as the only place that uses it
* Move NullKeys out of their own package
* Move remaining crypto classes into superpackage
* Move utility classes out of crypto and into utilities package
Rewrite ExchangeRate to use BigDecimal for the quantity multiplication, to ensure that there is no loss of precision during the conversion process. The previous version using double-precision floating point maths inherently means that the precision is not fixed, but is floating.
Change ExchangeRate to an abstract class rather than an interface, so the functions on it can be implemented directly rather than being extension functions, to improve Java compatibility.
Re-enable code now DealState PR is in.
Add plugable JSON serialisation
Add docs for new plugin api.
Move parseCurrency back to core to prevent dependency issues with crash shell parsing.
Use :finance module as a proper CorDapp
Move parseCurrency back onto Amount companion.
Fix smoke tests
Fixup after merge.
Change CashIssueFlow to always issue to ourselves, and require the cash is then moved in a separate payment
operation. This more closely models actual operation inside banks, and is a step towards making all move-like
operations go through a uniform verification process.
* Remove IssuerFlow as it is dangerous and its presence in the finance module risks accidental use in non-test code. As written it will issue arbitary amounts of currency on request from any node on the network, with no validation barring that the currency type is valid.
* Unify interface to CashIssueFlow to match the previous IssuerFlow
any property (any getter), which causes issues on the SignedTransaction, since it
attempts to resolve both a regular and a notary change transaction from the serialized bytes.
* Updated all sample code to use new Vault Query service APIs.
* Fix broken Unit test.
* Added missing transaction boundary.
* Fix broken ScheduledFlow test (caused by assertion on non-ordered collection)
* Remove redundant negative test (as new Vault Query no longer returns iterators).
* Whitespace formatting fixed following PR review from SA.
* Force query to specify a PAGE SIZE equivalent to total states to be exited (RP review comment).
* Use single (and fail fast) instead of first - when only expecting a single result.
* Demonstrate paging and sorting; failfast on single expected result.
* Enhancement: added Sorting by CommonStateAttribute (StateRef txnId and index)
* Fix: incorrect total states count.
* Fixed incorrect total states counting.
* Remove redundant filter (UNCONSUMED).
* Updated tutorial code and associated documentation (building transactions).
* Updated all vaultAndUpdates to vault[Track|Query]By.
* Temporary disable failing Vault Query tests (awaiting pagination PR fix).
* Rebase from master to pick up pagination changes/fix.
* Fixed criteria filter on track.
* Cleanup redundant print output.
* Refactor to extract common function for Vault Query paging and sorting.
* Identified problem in SimmValuation demo failing test caused by query by single participant in participants list (not yet supported in VaultQuery criteria).
* Minor fixes following rebase from master.
* Minor updates following rebase.
* Removed redundant import.
* Fixed type casting error.
* Minor fixes following rebase from master.
* VQ Fix - applied in other PR.
* Removed duplication after rebase and minor fix to failing smoke test.
