Skip to content

Commit c3c4772

Browse files
OlegDokukaOlegDokuka
committed
update to latest rsocket version
Signed-off-by: Oleh Dokuka <[email protected]>
1 parent 26a7489 commit c3c4772

File tree

17 files changed

+67
-90
lines changed

17 files changed

+67
-90
lines changed

‎build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
plugins {
22
id 'com.google.osdetector' version '1.4.0'
3-
id 'com.github.sherter.google-java-format' version '0.8' apply false
3+
id 'com.github.sherter.google-java-format' version '0.9' apply false
44
id 'com.github.johnrengelman.shadow' version '5.2.0' apply false
5-
id 'com.jfrog.artifactory' version '4.12.0' apply false
6-
id 'com.jfrog.bintray' version '1.8.4' apply false
5+
id 'com.jfrog.artifactory' version '4.18.3' apply false
6+
id 'com.jfrog.bintray' version '1.8.5' apply false
77
id 'me.champeau.gradle.jmh' version '0.5.0' apply false
88
id 'io.morethan.jmhreport' version '0.9.0' apply false
9-
id 'com.google.protobuf' version '0.8.10' apply false
10-
id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false
9+
id 'com.google.protobuf' version '0.8.14' apply false
10+
id 'io.spring.dependency-management' version '1.0.10.RELEASE' apply false
1111
}
1212

1313
apply from: 'artifactory.gradle'

‎gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
group=io.rsocket.rpc
22
version=0.3.0
33

4-
reactorBomVersion=Dysprosium-SR7
5-
rsocketVersion=1.0.0
4+
reactorBomVersion=2020.0.0
5+
rsocketVersion=1.1.0
66
graphqlVersion=11.0
77
protobufVersion=3.7.1
88
log4jVersion=2.12.1

‎gradle/wrapper/gradle-wrapper.jar

3.22 KB
Binary file not shown.

‎gradlew

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ esac
8282

8383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
8484

85+
8586
# Determine the Java command to use to start the JVM.
8687
if [ -n "$JAVA_HOME" ] ; then
8788
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
129130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
132134
JAVACMD=`cygpath --unix "$JAVACMD"`
133135

134136
# We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
154156
else
155157
eval `echo args$i`="\"$arg\""
156158
fi
157-
i=$((i+1))
159+
i=`expr $i + 1`
158160
done
159161
case $i in
160-
(0) set -- ;;
161-
(1) set -- "$args0" ;;
162-
(2) set -- "$args0" "$args1" ;;
163-
(3) set -- "$args0" "$args1" "$args2" ;;
164-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
170172
esac
171173
fi
172174

@@ -175,14 +177,9 @@ save () {
175177
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176178
echo " "
177179
}
178-
APP_ARGS=$(save "$@")
180+
APP_ARGS=`save "$@"`
179181

180182
# Collect all arguments for the java command, following the shell quoting and substitution rules
181183
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
182184

183-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
184-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
185-
cd "$(dirname "$0")"
186-
fi
187-
188185
exec "$JAVACMD" "$@"

‎gradlew.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
2929
set APP_BASE_NAME=%~n0
3030
set APP_HOME=%DIRNAME%
3131

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
3235
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
3336
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
3437

@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
8184

8285
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8386

87+
8488
@rem Execute Gradle
8589
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
8690

‎rsocket-ipc-core/src/main/java/io/rsocket/ipc/IPCRSocket.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,11 @@
1616
package io.rsocket.ipc;
1717

1818
import io.rsocket.Payload;
19-
import io.rsocket.ResponderRSocket;
20-
import org.reactivestreams.Publisher;
19+
import io.rsocket.RSocket;
2120
import reactor.core.publisher.Flux;
2221

23-
public interface IPCRSocket extends ResponderRSocket, SelfRegistrable {
22+
public interface IPCRSocket extends RSocket, SelfRegistrable {
2423
String getService();
2524

2625
Flux<Payload> requestChannel(Payload payload, Flux<Payload> publisher);
27-
28-
default Flux<Payload> requestChannel(Payload payload, Publisher<Payload> payloads) {
29-
return requestChannel(payload, Flux.from(payloads));
30-
}
3126
}

‎rsocket-ipc-core/src/main/java/io/rsocket/ipc/RequestHandlingRSocket.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616
package io.rsocket.ipc;
1717

1818
import io.opentracing.Tracer;
19-
import io.rsocket.ResponderRSocket;
2019
import io.rsocket.ipc.routing.SimpleRouter;
2120

22-
public class RequestHandlingRSocket extends RoutingServerRSocket implements ResponderRSocket {
21+
public class RequestHandlingRSocket extends RoutingServerRSocket {
2322

2423
public RequestHandlingRSocket() {
2524
super(new SimpleRouter());

‎rsocket-ipc-core/src/main/java/io/rsocket/ipc/RoutingServerRSocket.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
package io.rsocket.ipc;
1717

1818
import io.opentracing.Tracer;
19-
import io.rsocket.AbstractRSocket;
2019
import io.rsocket.Payload;
21-
import io.rsocket.ResponderRSocket;
20+
import io.rsocket.RSocket;
2221
import io.rsocket.ipc.decoders.CompositeMetadataDecoder;
2322
import io.rsocket.ipc.exception.RouteNotFound;
2423
import io.rsocket.ipc.util.IPCChannelFunction;
@@ -27,7 +26,7 @@
2726
import reactor.core.publisher.Flux;
2827
import reactor.core.publisher.Mono;
2928

30-
public class RoutingServerRSocket extends AbstractRSocket implements ResponderRSocket {
29+
public class RoutingServerRSocket implements RSocket {
3130

3231
final Router router;
3332
final MetadataDecoder decoder;
@@ -48,7 +47,7 @@ public RoutingServerRSocket(MetadataDecoder decoder, Router router) {
4847
@Override
4948
public Mono<Void> fireAndForget(Payload payload) {
5049
try {
51-
final MetadataDecoder.Metadata decodedMetadata = decoder.decode(payload.sliceMetadata());
50+
final MetadataDecoder.Metadata decodedMetadata = this.decoder.decode(payload.sliceMetadata());
5251

5352
final String route = decodedMetadata.route();
5453
final IPCFunction<Mono<Void>> monoIPCFunction = this.router.routeFireAndForget(route);
@@ -71,7 +70,7 @@ public Mono<Void> fireAndForget(Payload payload) {
7170
@Override
7271
public Mono<Payload> requestResponse(Payload payload) {
7372
try {
74-
final MetadataDecoder.Metadata decodedMetadata = decoder.decode(payload.sliceMetadata());
73+
final MetadataDecoder.Metadata decodedMetadata = this.decoder.decode(payload.sliceMetadata());
7574

7675
final String route = decodedMetadata.route();
7776
final IPCFunction<Mono<Payload>> monoIPCFunction = this.router.routeRequestResponse(route);
@@ -94,7 +93,7 @@ public Mono<Payload> requestResponse(Payload payload) {
9493
@Override
9594
public Flux<Payload> requestStream(Payload payload) {
9695
try {
97-
final MetadataDecoder.Metadata decodedMetadata = decoder.decode(payload.sliceMetadata());
96+
final MetadataDecoder.Metadata decodedMetadata = this.decoder.decode(payload.sliceMetadata());
9897

9998
final String route = decodedMetadata.route();
10099
final IPCFunction<Flux<Payload>> ffContext = this.router.routeRequestStream(route);
@@ -129,14 +128,9 @@ public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
129128
});
130129
}
131130

132-
@Override
133-
public Flux<Payload> requestChannel(Payload payload, Publisher<Payload> payloads) {
134-
return doRequestChannel(payload, Flux.from(payloads));
135-
}
136-
137131
private Flux<Payload> doRequestChannel(Payload payload, Flux<Payload> payloadFlux) {
138132
try {
139-
final MetadataDecoder.Metadata decodedMetadata = decoder.decode(payload.sliceMetadata());
133+
final MetadataDecoder.Metadata decodedMetadata = this.decoder.decode(payload.sliceMetadata());
140134

141135
final String route = decodedMetadata.route();
142136
final IPCChannelFunction ffContext = this.router.routeRequestChannel(route);

‎rsocket-ipc-core/src/main/java/io/rsocket/ipc/decoders/CompositeMetadataDecoder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static io.rsocket.ipc.frames.Metadata.getMetadata;
2020
import static io.rsocket.ipc.frames.Metadata.getMethod;
2121
import static io.rsocket.ipc.frames.Metadata.getService;
22-
import static io.rsocket.metadata.CompositeMetadataFlyweight.hasEntry;
22+
import static io.rsocket.metadata.CompositeMetadataCodec.hasEntry;
2323

2424
import io.netty.buffer.ByteBuf;
2525
import io.netty.buffer.Unpooled;

‎rsocket-ipc-core/src/test/java/io/rsocket/ipc/IntegrationTest.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
import io.netty.buffer.ByteBufAllocator;
1919
import io.rsocket.RSocket;
20-
import io.rsocket.RSocketFactory;
20+
import io.rsocket.core.RSocketConnector;
21+
import io.rsocket.core.RSocketServer;
2122
import io.rsocket.ipc.decoders.CompositeMetadataDecoder;
2223
import io.rsocket.ipc.encoders.DefaultMetadataEncoder;
2324
import io.rsocket.ipc.marshallers.Primitives;
@@ -37,17 +38,13 @@ public void test() {
3738
RequestHandlingRSocket requestHandler =
3839
new RequestHandlingRSocket(new CompositeMetadataDecoder());
3940

40-
RSocketFactory.receive()
41+
RSocketServer.create()
4142
.acceptor((setup, sendingSocket) -> Mono.just(requestHandler))
42-
.transport(LocalServerTransport.create("test-local-server"))
43-
.start()
43+
.bind(LocalServerTransport.create("test-local-server"))
4444
.block();
4545

4646
RSocket rsocket =
47-
RSocketFactory.connect()
48-
.transport(LocalClientTransport.create("test-local-server"))
49-
.start()
50-
.block();
47+
RSocketConnector.connectWith(LocalClientTransport.create("test-local-server")).block();
5148

5249
AtomicBoolean ff = new AtomicBoolean();
5350

‎rsocket-ipc-graphql/src/test/java/io/rsocket/graphql/GraphQLIntegrationTest.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
import io.netty.buffer.ByteBufAllocator;
1313
import io.netty.buffer.ByteBufInputStream;
1414
import io.rsocket.RSocket;
15-
import io.rsocket.RSocketFactory;
15+
import io.rsocket.core.RSocketConnector;
16+
import io.rsocket.core.RSocketServer;
1617
import io.rsocket.ipc.IPCRSocket;
1718
import io.rsocket.ipc.RequestHandlingRSocket;
1819
import io.rsocket.ipc.Unmarshaller;
@@ -36,19 +37,12 @@ public class GraphQLIntegrationTest {
3637
public void testQuery() throws Exception {
3738
RequestHandlingRSocket requestHandler = new RequestHandlingRSocket();
3839

39-
RSocketFactory.receive()
40-
.errorConsumer(Throwable::printStackTrace)
40+
RSocketServer.create()
4141
.acceptor((setup, sendingSocket) -> Mono.just(requestHandler))
42-
.transport(LocalServerTransport.create("testQuery"))
43-
.start()
44-
.block();
42+
.bindNow(LocalServerTransport.create("testQuery"));
4543

4644
RSocket rsocket =
47-
RSocketFactory.connect()
48-
.errorConsumer(Throwable::printStackTrace)
49-
.transport(LocalClientTransport.create("testQuery"))
50-
.start()
51-
.block();
45+
RSocketConnector.connectWith(LocalClientTransport.create("testQuery")).block();
5246

5347
String query =
5448
"{\n"

‎rsocket-rpc-core/src/main/java/io/rsocket/rpc/AbstractRSocketService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import io.rsocket.Payload;
44
import io.rsocket.RSocket;
5+
import io.rsocket.ipc.IPCRSocket;
56
import reactor.core.publisher.Flux;
67

7-
public abstract class AbstractRSocketService implements RSocket, RSocketRpcService {
8+
public abstract class AbstractRSocketService implements RSocket, IPCRSocket {
89
@Override
910
public String getService() {
1011
return getClass().getName();

‎rsocket-rpc-core/src/main/java/io/rsocket/rpc/BlockingIterable.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
import reactor.util.annotation.Nullable;
1818

1919
/**
20-
* An iterable that consumes a Publisher in a blocking fashion.
21-
*
22-
* <p>
20+
* An iterable that consumes a Publisher in a blocking fashion. <br>
21+
* <br>
2322
*
2423
* <p>It also implements methods to stream the contents via Stream that also supports cancellation.
2524
*

‎rsocket-rpc-core/src/main/java/io/rsocket/rpc/rsocket/RequestHandlingRSocket.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package io.rsocket.rpc.rsocket;
22

3-
import io.rsocket.ResponderRSocket;
43
import io.rsocket.ipc.SelfRegistrable;
54
import io.rsocket.rpc.RSocketRpcService;
65

76
@Deprecated
8-
public class RequestHandlingRSocket extends io.rsocket.ipc.RequestHandlingRSocket
9-
implements ResponderRSocket {
7+
public class RequestHandlingRSocket extends io.rsocket.ipc.RequestHandlingRSocket {
8+
109
public RequestHandlingRSocket(RSocketRpcService... services) {
1110
super();
1211
for (RSocketRpcService rsocketService : services) {

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,10 +1102,10 @@ static void PrintServer(const ServiceDescriptor* service,
11021102
p->Indent();
11031103
p->Print(
11041104
*vars,
1105-
"$CodedInputStream$ is = $CodedInputStream$.newInstance(data.getData());\n"
1105+
"$CodedInputStream$ is = $CodedInputStream$.newInstance(payload.getData());\n"
11061106
"$input_type$ message = $input_type$.parseFrom(is);\n"
11071107
"$ByteBuf$ metadata = decoded.metadata().retain();\n"
1108-
"return $Flux$.defer(() -> { try { return $Flux$.fromIterable(service.$lower_method_name$(message, metadata).map(serializer).transform($lower_method_name$); } finally { metadata.release(); }).subscribeOn(scheduler);\n");
1108+
"return $Flux$.defer(() -> { try { return $Flux$.fromIterable(service.$lower_method_name$(message, metadata)).map(serializer).transform($lower_method_name$); } finally { metadata.release(); } }).subscribeOn(scheduler);\n");
11091109
p->Outdent();
11101110
p->Print("}\n");
11111111
p->Print("\n");
@@ -1441,8 +1441,8 @@ void GenerateClient(const ServiceDescriptor* service,
14411441
vars["ByteBuffer"] = "java.nio.ByteBuffer";
14421442
vars["CodedInputStream"] = "com.google.protobuf.CodedInputStream";
14431443
vars["CodedOutputStream"] = "com.google.protobuf.CodedOutputStream";
1444-
vars["RSocketRpcMetadata"] = "io.rsocket.rpc.frames.Metadata";
1445-
vars["RSocketRpcMetrics"] = "io.rsocket.rpc.metrics.Metrics";
1444+
vars["RSocketRpcMetadata"] = "io.rsocket.ipc.frames.Metadata";
1445+
vars["RSocketRpcMetrics"] = "io.rsocket.ipc.metrics.Metrics";
14461446
vars["MeterRegistry"] = "io.micrometer.core.instrument.MeterRegistry";
14471447
vars["MessageLite"] = "com.google.protobuf.MessageLite";
14481448
vars["Parser"] = "com.google.protobuf.Parser";
@@ -1451,7 +1451,7 @@ void GenerateClient(const ServiceDescriptor* service,
14511451
vars["PackageName"] = ServiceJavaPackage(service->file());
14521452
vars["Queues"] = "reactor.util.concurrent.Queues";
14531453
vars["RSocketRpcGeneratedMethod"] = "io.rsocket.rpc.annotations.internal.GeneratedMethod";
1454-
vars["Tag"] = "io.rsocket.rpc.tracing.Tag";
1454+
vars["Tag"] = "io.rsocket.ipc.tracing.Tag";
14551455
vars["Map"] = "java.util.Map";
14561456
vars["HashMap"] = "java.util.HashMap";
14571457
vars["Supplier"] = "java.util.function.Supplier";
@@ -1500,8 +1500,8 @@ void GenerateServer(const ServiceDescriptor* service,
15001500
vars["ByteBufPayload"] = "io.rsocket.util.ByteBufPayload";
15011501
vars["SwitchTransformFlux"] = "io.rsocket.internal.SwitchTransformFlux";
15021502
vars["AbstractRSocketService"] = "io.rsocket.rpc.AbstractRSocketService";
1503-
vars["RSocketRpcMetadata"] = "io.rsocket.rpc.frames.Metadata";
1504-
vars["RSocketRpcMetrics"] = "io.rsocket.rpc.metrics.Metrics";
1503+
vars["RSocketRpcMetadata"] = "io.rsocket.ipc.frames.Metadata";
1504+
vars["RSocketRpcMetrics"] = "io.rsocket.ipc.metrics.Metrics";
15051505
vars["MeterRegistry"] = "io.micrometer.core.instrument.MeterRegistry";
15061506
vars["ByteBuf"] = "io.netty.buffer.ByteBuf";
15071507
vars["ByteBuffer"] = "java.nio.ByteBuffer";
@@ -1517,8 +1517,7 @@ void GenerateServer(const ServiceDescriptor* service,
15171517
vars["Optional"] = "java.util.Optional";
15181518
vars["Inject"] = "javax.inject.Inject";
15191519
vars["Named"] = "javax.inject.Named";
1520-
vars["RSocketRpcResourceType"] = "io.rsocket.rpc.annotations.internal.ResourceType";
1521-
vars["Tag"] = "io.rsocket.rpc.tracing.Tag";
1520+
vars["Tag"] = "io.rsocket.ipc.tracing.Tag";
15221521
vars["SpanContext"] = "io.opentracing.SpanContext";
15231522
vars["Tracer"] = "io.opentracing.Tracer";
15241523
vars["Map"] = "java.util.Map";

0 commit comments

Comments
 (0)