Skip to content

Commit fcebad9

Browse files
mostroverkhovrobertroeser
authored andcommitted
rpc compiler: opt-in blocking api generation (#48)
* update reactor & rsocket dependencies replace jcenter with mavenCentral * rpc compiler: opt-in blocking api generation
1 parent f32f36f commit fcebad9

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ subprojects {
3434
sourceCompatibility = 1.8
3535
targetCompatibility = 1.8
3636

37-
ext['reactor-bom.version'] = 'Dysprosium-M3'
38-
ext['rsocket.version'] = '1.0.0-RC2'
37+
ext['reactor-bom.version'] = 'Dysprosium-RELEASE'
38+
ext['rsocket.version'] = '1.0.0-RC5'
3939

4040
ext['protobuf.version'] = '3.6.1'
4141
ext['log4j.version'] = '2.11.2'
@@ -52,8 +52,7 @@ subprojects {
5252
ext['hdrhistogram.version'] = '2.1.10'
5353

5454
repositories {
55-
jcenter()
56-
maven { url 'https://repo.spring.io/milestone' }
55+
mavenCentral()
5756
if (version.endsWith('BUILD-SNAPSHOT') || project.hasProperty('platformVersion')) {
5857
maven { url 'http://repo.spring.io/libs-snapshot' }
5958
maven { url 'https://oss.jfrog.org/oss-snapshot-local' }

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
group=io.rsocket.rpc
2-
version=0.2.19
2+
version=0.2.20-SNAPSHOT

rsocket-rpc-protobuf/src/java_plugin/cpp/java_plugin.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,23 @@ class JavaRSocketRpcGenerator : public google::protobuf::compiler::CodeGenerator
8282
blocking_java_rsocket_rpc_generator::ProtoFlavor::NORMAL;
8383

8484
bool disable_version = false;
85+
bool generate_blocking_api = false;
86+
8587
for (size_t i = 0; i < options.size(); i++) {
86-
if (options[i].first == "lite") {
88+
const string& option = options[i].first;
89+
if (option == "lite") {
8790
flavor = blocking_java_rsocket_rpc_generator::ProtoFlavor::LITE;
88-
} else if (options[i].first == "noversion") {
91+
} else if (option == "noversion") {
8992
disable_version = true;
93+
} else if (option == "generate-blocking-api") {
94+
generate_blocking_api = true;
9095
}
9196
}
9297

98+
if (!generate_blocking_api) {
99+
return true;
100+
}
101+
93102
string package_name = blocking_java_rsocket_rpc_generator::ServiceJavaPackage(file);
94103
string package_filename = JavaPackageToDir(package_name);
95104
for (int i = 0; i < file->service_count(); ++i) {

0 commit comments

Comments
 (0)