Skip to content

Commit 6d74f57

Browse files
authored
adding IPC style interactions (#43)
* adding IPC style interactions * fix typo * typos * graphql support using ipc code * clean up conversion to mono, removed some duplicate code * remove java 11 specific api * add tracing and metrics support * add the ability to replace marshaller / unmarshaller at function level * adding graphql version * updates to the latest gradle version and fix jdk-8 compilation issue * fixes jdk path for windows build
1 parent fcebad9 commit 6d74f57

File tree

34 files changed

+2970
-4
lines changed

34 files changed

+2970
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- rm -r "/c/Program Files (x86)/Microsoft Visual Studio 14.0"
2424
- export PATH=$PATH:"/c/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/HostX86/x64"
2525
- choco install -y adoptopenjdk8
26-
- export PATH=$PATH:"/c/Program Files/AdoptOpenJDK/jdk8u222-b10/bin"
26+
- export PATH=$PATH:"/c/Program Files/AdoptOpenJDK/jdk-8.0.222.10-hotspot/bin"
2727
- wget https://github.com/google/protobuf/releases/download/v3.6.1/protobuf-cpp-3.6.1.tar.gz
2828
- tar -xzf protobuf-cpp-3.6.1.tar.gz
2929
- pushd protobuf-3.6.1/cmake

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ apply from: 'artifactory.gradle'
1414
apply from: 'bintray.gradle'
1515
apply from: 'publication.gradle'
1616

17-
buildScan {
17+
buildScan {
1818
termsOfServiceUrl = 'https://gradle.com/terms-of-service'
1919
termsOfServiceAgree = 'yes'
2020
}
@@ -36,7 +36,7 @@ subprojects {
3636

3737
ext['reactor-bom.version'] = 'Dysprosium-RELEASE'
3838
ext['rsocket.version'] = '1.0.0-RC5'
39-
39+
ext['graphql.version'] = '11.0'
4040
ext['protobuf.version'] = '3.6.1'
4141
ext['log4j.version'] = '2.11.2'
4242
ext['slf4j.version'] = '1.8.0-beta2'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

rsocket-ipc-core/build.gradle

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
plugins {
2+
id 'io.spring.dependency-management' version '1.0.7.RELEASE'
3+
}
4+
5+
description = 'RSocket IPC Library'
6+
7+
dependencies {
8+
compile project (':rsocket-rpc-core')
9+
implementation 'org.slf4j:slf4j-api'
10+
11+
api 'io.opentracing:opentracing-api'
12+
api 'javax.inject:javax.inject'
13+
api 'javax.annotation:javax.annotation-api'
14+
api 'io.rsocket:rsocket-core'
15+
api 'io.micrometer:micrometer-core'
16+
17+
testImplementation 'io.opentracing.brave:brave-opentracing'
18+
testImplementation 'junit:junit'
19+
20+
testImplementation 'javax.inject:javax.inject'
21+
testImplementation 'io.projectreactor:reactor-test'
22+
testImplementation 'com.google.protobuf:protobuf-java'
23+
testImplementation 'org.hdrhistogram:HdrHistogram'
24+
testImplementation 'org.apache.logging.log4j:log4j-api'
25+
testImplementation 'org.apache.logging.log4j:log4j-core'
26+
testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl'
27+
testImplementation 'io.rsocket:rsocket-transport-netty'
28+
testImplementation 'io.rsocket:rsocket-transport-local'
29+
testImplementation 'org.mockito:mockito-core'
30+
testImplementation 'io.zipkin.reporter2:zipkin-sender-okhttp3'
31+
}
32+
33+
dependencyManagement {
34+
imports {
35+
mavenBom "io.projectreactor:reactor-bom:${ext['reactor-bom.version']}"
36+
}
37+
38+
dependencies {
39+
dependencySet(group: 'com.google.protobuf', version: ext['protobuf.version']) {
40+
entry 'protobuf-java'
41+
entry 'protoc'
42+
}
43+
dependency "com.google.protobuf:protoc:${ext['protobuf.version']}"
44+
45+
dependency "javax.inject:javax.inject:1"
46+
dependency "javax.annotation:javax.annotation-api:1.2"
47+
48+
dependencySet(group: 'org.apache.logging.log4j', version: ext['log4j.version']) {
49+
entry "log4j-api"
50+
entry "log4j-core"
51+
entry "log4j-slf4j-impl"
52+
}
53+
54+
dependency "org.slf4j:slf4j-api:${ext['slf4j.version']}"
55+
dependency "org.slf4j:slf4j-simple:${ext['slf4j.version']}"
56+
57+
dependencySet(group: 'io.rsocket', version: ext['rsocket.version']) {
58+
entry 'rsocket-core'
59+
entry 'rsocket-transport-netty'
60+
entry 'rsocket-transport-local'
61+
}
62+
63+
dependency "io.micrometer:micrometer-core:${ext['micrometer.version']}"
64+
dependency "io.opentracing:opentracing-api:${ext['opentracing.version']}"
65+
dependency "io.opentracing.brave:brave-opentracing:${ext['opentracing.brave.version']}"
66+
dependency "io.zipkin.reporter2:zipkin-sender-okhttp3:${ext['zipkin.sender.version']}"
67+
68+
// TODO: Remove after JUnit5 migration
69+
// TEST DEPENDENCIES
70+
71+
dependency 'junit:junit:4.12'
72+
73+
dependencySet(group: 'org.junit.jupiter', version: ext['junit.version']) {
74+
entry 'junit-jupiter-api'
75+
entry 'junit-jupiter-engine'
76+
entry 'junit-jupiter-params'
77+
}
78+
79+
80+
dependency "org.mockito:mockito-core:${ext['mockito.version']}"
81+
dependency "org.hamcrest:hamcrest-library:${ext['hamcrest.version']}"
82+
dependency "org.assertj:assertj-core:${ext['assertj.version']}"
83+
dependency "org.hdrhistogram:HdrHistogram:${ext['hdrhistogram.version']}"
84+
85+
86+
dependencySet(group: 'org.junit.vintage', version: ext['junit.version']) {
87+
entry 'junit-vintage-engine'
88+
}
89+
90+
dependencySet(group: 'org.openjdk.jmh', version: ext['jmh.version']) {
91+
entry 'jmh-core'
92+
entry 'jmh-generator-annprocess'
93+
}
94+
}
95+
}

0 commit comments

Comments
 (0)