mirror of
https://github.com/corda/corda.git
synced 2024-12-28 08:48:57 +00:00
f8ad5c9d10
* Vault Query Service API implementation using JPA Hibernate Added queryBy(QueryCriteria) Vault API and Junit tests. Minor cosmetic API changes following rebase. Fixes following rebase from master Upgraded to requery 1.3.1 WIP - removed 'latestOnly' from LinearStateQueryCriteria WIP - CommercialSchemas V2, V3, V4 testing WIP - sort out generics handling. WIP - most general queries completed. WIP - join queries, contractStateType derivation WIP - refactoring Requery WIP - refactored VaultService to extract a VaultQueryService interface (and associated Requery implementation). WIP - HibernateVaultQuery implementation WIP - Re-structured all Schema definitions (requery/jpa) and make Hibernate Config reusable. WIP - Multi-version schema testing, hibernate query testing. WIP - Custom Criteria and Fungible Criteria impl & testing. WIP - Kotlin Comparable Generics error WIP - Party queries all working now WIP - All VaultQueryTests now working (refactored for AND / OR composition) WIP - added schema registration in CordaPluginRegistry to enable custom vault queries on arbitrary schemas. WIP - added new default Sort NULL order to be NONE + added lots more tests for Logical Operator testing. Mostly identity fixes following rebase from master. Exception handling and public API cleanup in prep for PR. Additional tests for Logical Operators; additional tests for NULLS sort ordering; additional logging; Additional parser to handle Nullable attribute values; added Unary and Collection logical expression handlers Lots of cleanup: participants; trackBy interfaces; additional fungible tests; parser cleanup and improved support for Java Removed all traces of Requery implementation. Further minor cleanup and Junit test fix. Final identity and schema related identity clean-up. Revert unrelated changes. PR review updates: blank lines, isRelevant. Fixed wiring of updatesPublisher for dynamic trackBy queries. PR review changes: multi-versioned schema samples and associated dummy contracts moved to test packages. Fixed problem with sorted queries (not specifying any filterable criteria). PR review: minor updates to address RP comments. Typesafe custom query criteria Cleanup: remove redundant tests. Further clean-up and make all Java test work successfully. Remove debugging print statements. Rebased from master - changes required due to DealState module change. fixed broken assertion caused by DealState ordering change (different package) Fixed transaction demarcation issue causing "java.lang.IllegalStateException: Was not expecting to find existing database transaction on current strand" trackBy() now filters on ContractType and StateStatus (CONSUMED, UNCONSUMED, ALL) Added tests to exercise RPCOps trackBy and queryBy (RPC smoke test and CordaRPCOps) Added additional @CordaSerializable annotations. Updated documentation and referenced sample code. Added deprecation annotations. Re-added missing deprecation annotation. Hibernate debug logging is now configurable and disabled by default. Introduced common Sort attributes based on the node schemas. Completely removed NULL_HANDLING sort parameter as this is not supported in JPA. Revisited and fixed usage of @CordaSerializable. * Minor fix following rebase from master. * Remove blank line as per RP PR feedback request. * Minor Java documentation and example clean-up. * Disable BFT Notary Service tests.
216 lines
7.7 KiB
Groovy
216 lines
7.7 KiB
Groovy
apply plugin: 'kotlin'
|
|
// Java Persistence API support: create no-arg constructor
|
|
// see: http://stackoverflow.com/questions/32038177/kotlin-with-jpa-default-constructor-hell
|
|
apply plugin: 'kotlin-jpa'
|
|
apply plugin: 'java'
|
|
apply plugin: 'net.corda.plugins.quasar-utils'
|
|
apply plugin: 'net.corda.plugins.publish-utils'
|
|
|
|
description 'Corda node modules'
|
|
|
|
//noinspection GroovyAssignabilityCheck
|
|
configurations {
|
|
// we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
|
|
runtime.exclude module: 'isolated'
|
|
|
|
compile {
|
|
// We don't need these because we already include netty-all.
|
|
exclude group: 'io.netty', module: 'netty-transport'
|
|
exclude group: 'io.netty', module: 'netty-handler'
|
|
}
|
|
|
|
testCompile {
|
|
// Excluding javassist:javassist because it clashes with Hibernate's
|
|
// transitive org.javassist:javassist dependency.
|
|
// TODO: Remove this exclusion once junit-quickcheck 0.8 is released.
|
|
exclude group: 'javassist', module: 'javassist'
|
|
}
|
|
|
|
integrationTestCompile.extendsFrom testCompile
|
|
integrationTestRuntime.extendsFrom testRuntime
|
|
|
|
smokeTestCompile.extendsFrom compile
|
|
smokeTestRuntime.extendsFrom runtime
|
|
}
|
|
|
|
sourceSets {
|
|
integrationTest {
|
|
kotlin {
|
|
compileClasspath += main.output + test.output
|
|
runtimeClasspath += main.output + test.output
|
|
srcDir file('src/integration-test/kotlin')
|
|
}
|
|
resources {
|
|
srcDir file('src/integration-test/resources')
|
|
}
|
|
}
|
|
smokeTest {
|
|
kotlin {
|
|
// We must NOT have any Node code on the classpath, so do NOT
|
|
// include the test or integrationTest dependencies here.
|
|
compileClasspath += main.output
|
|
runtimeClasspath += main.output
|
|
srcDir file('src/smoke-test/kotlin')
|
|
}
|
|
}
|
|
}
|
|
|
|
// Use manual resource copying of log4j2.xml rather than source sets.
|
|
// This prevents problems in IntelliJ with regard to duplicate source roots.
|
|
processResources {
|
|
from file("$rootDir/config/dev/log4j2.xml")
|
|
}
|
|
|
|
processSmokeTestResources {
|
|
// Build one of the demos so that we can test CorDapp scanning in CordappScanningTest. It doesn't matter which demo
|
|
// we use, just make sure the test is updated accordingly.
|
|
from(project(':samples:trader-demo').tasks.jar) {
|
|
rename 'trader-demo-(.*)', 'trader-demo.jar'
|
|
}
|
|
from(project(':node:capsule').tasks.buildCordaJAR) {
|
|
rename 'corda-(.*)', 'corda.jar'
|
|
}
|
|
}
|
|
|
|
// To find potential version conflicts, run "gradle htmlDependencyReport" and then look in
|
|
// build/reports/project/dependencies/index.html for green highlighted parts of the tree.
|
|
|
|
dependencies {
|
|
compile project(':finance')
|
|
compile project(':node-schemas')
|
|
compile project(':node-api')
|
|
compile project(':client:rpc')
|
|
compile project(':cordform-common')
|
|
|
|
compile "com.google.code.findbugs:jsr305:3.0.1"
|
|
|
|
// Log4J: logging framework (with SLF4J bindings)
|
|
compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
|
|
compile "org.apache.logging.log4j:log4j-web:${log4j_version}"
|
|
compile "org.slf4j:jul-to-slf4j:$slf4j_version"
|
|
|
|
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
|
|
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
|
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
|
|
|
|
compile "com.google.guava:guava:$guava_version"
|
|
|
|
// JOpt: for command line flags.
|
|
compile "net.sf.jopt-simple:jopt-simple:$jopt_simple_version"
|
|
|
|
// Artemis: for reliable p2p message queues.
|
|
compile "org.apache.activemq:artemis-server:${artemis_version}"
|
|
compile "org.apache.activemq:artemis-core-client:${artemis_version}"
|
|
runtime ("org.apache.activemq:artemis-amqp-protocol:${artemis_version}") {
|
|
// Gains our proton-j version from core module.
|
|
exclude group: 'org.apache.qpid', module: 'proton-j'
|
|
}
|
|
|
|
// JAnsi: for drawing things to the terminal in nicely coloured ways.
|
|
compile "org.fusesource.jansi:jansi:$jansi_version"
|
|
|
|
// Manifests: for reading stuff from the manifest file
|
|
compile "com.jcabi:jcabi-manifests:1.1"
|
|
|
|
// GraphStream: For visualisation
|
|
testCompile "org.graphstream:gs-core:1.3"
|
|
testCompile("org.graphstream:gs-ui:1.3") {
|
|
exclude group: "bouncycastle"
|
|
}
|
|
compile("com.intellij:forms_rt:7.0.3") {
|
|
exclude group: "asm"
|
|
}
|
|
|
|
// Jackson support: serialisation to/from JSON, YAML, etc
|
|
compile project(':client:jackson')
|
|
|
|
// Coda Hale's Metrics: for monitoring of key statistics
|
|
compile "io.dropwizard.metrics:metrics-core:3.1.2"
|
|
|
|
// JimFS: in memory java.nio filesystem. Used for test and simulation utilities.
|
|
compile "com.google.jimfs:jimfs:1.1"
|
|
|
|
// TypeSafe Config: for simple and human friendly config files.
|
|
compile "com.typesafe:config:$typesafe_config_version"
|
|
|
|
// Unit testing helpers.
|
|
testCompile "junit:junit:$junit_version"
|
|
testCompile "org.assertj:assertj-core:${assertj_version}"
|
|
testCompile "com.pholser:junit-quickcheck-core:$quickcheck_version"
|
|
testCompile project(':test-utils')
|
|
testCompile project(':client:jfx')
|
|
|
|
// sample test schemas
|
|
testCompile project(path: ':finance', configuration: 'testArtifacts')
|
|
|
|
// For H2 database support in persistence
|
|
compile "com.h2database:h2:$h2_version"
|
|
|
|
// Exposed: Kotlin SQL library - under evaluation
|
|
// TODO: Upgrade to Exposed 0.7 (has API changes)
|
|
compile "org.jetbrains.exposed:exposed:0.5.0"
|
|
|
|
// SQL connection pooling library
|
|
compile "com.zaxxer:HikariCP:2.5.1"
|
|
|
|
// Hibernate: an object relational mapper for writing state objects to the database automatically.
|
|
compile "org.hibernate:hibernate-core:$hibernate_version"
|
|
compile "org.hibernate:hibernate-java8:$hibernate_version"
|
|
|
|
// Capsule is a library for building independently executable fat JARs.
|
|
// We only need this dependency to compile our Caplet against.
|
|
compileOnly "co.paralleluniverse:capsule:$capsule_version"
|
|
|
|
// Java Atomix: RAFT library
|
|
compile 'io.atomix.copycat:copycat-client:1.2.3'
|
|
compile 'io.atomix.copycat:copycat-server:1.2.3'
|
|
compile 'io.atomix.catalyst:catalyst-netty:1.1.2'
|
|
|
|
// Netty: All of it.
|
|
compile "io.netty:netty-all:$netty_version"
|
|
|
|
// CRaSH: An embeddable monitoring and admin shell with support for adding new commands written in Groovy.
|
|
compile("com.github.corda.crash:crash.shell:9d242da2a10e686f33a3aefc69e4768824ad0716") {
|
|
exclude group: "org.slf4j", module: "slf4j-jdk14"
|
|
}
|
|
|
|
// OkHTTP: Simple HTTP library.
|
|
compile "com.squareup.okhttp3:okhttp:$okhttp_version"
|
|
|
|
// BFT-SMaRt
|
|
compile 'commons-codec:commons-codec:1.10'
|
|
compile 'com.github.bft-smart:library:master-v1.1-beta-g6215ec8-87'
|
|
|
|
// Requery: object mapper for Kotlin
|
|
compile "io.requery:requery-kotlin:$requery_version"
|
|
|
|
// FastClasspathScanner: classpath scanning
|
|
compile 'io.github.lukehutch:fast-classpath-scanner:2.0.21'
|
|
|
|
// Integration test helpers
|
|
integrationTestCompile "junit:junit:$junit_version"
|
|
integrationTestCompile "org.assertj:assertj-core:${assertj_version}"
|
|
|
|
// Smoke tests do NOT have any Node code on the classpath!
|
|
smokeTestCompile project(':smoke-test-utils')
|
|
smokeTestCompile "org.assertj:assertj-core:${assertj_version}"
|
|
smokeTestCompile "junit:junit:$junit_version"
|
|
}
|
|
|
|
task integrationTest(type: Test) {
|
|
testClassesDir = sourceSets.integrationTest.output.classesDir
|
|
classpath = sourceSets.integrationTest.runtimeClasspath
|
|
}
|
|
|
|
task smokeTest(type: Test) {
|
|
testClassesDir = sourceSets.smokeTest.output.classesDir
|
|
classpath = sourceSets.smokeTest.runtimeClasspath
|
|
}
|
|
|
|
jar {
|
|
baseName 'corda-node'
|
|
}
|
|
|
|
publish {
|
|
name = jar.baseName
|
|
} |