Skip to content

Commit 9e7476e

Browse files
committed
Merge tag '1.5.5' into develop
1.5.5
2 parents 082cb54 + de88f7c commit 9e7476e

File tree

6 files changed

+168
-2
lines changed

6 files changed

+168
-2
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ gradle-app.setting
9494
# Cache of project
9595
.gradletasknamecache
9696

97+
98+
.classpath
99+
.project
100+
**/.settings/*
101+
**/bin/*
102+
97103
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
98104
# gradle/wrapper/gradle-wrapper.properties
99105

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ subprojects {
77
// Proteus Versions
88
ext {
99
protobufVersion = '3.6.1'
10-
proteusVersion = '1.5.3'
10+
proteusVersion = '1.5.5'
1111
rsocketRpcVersion = '0.2.12'
1212
log4jVersion = '2.9.1'
1313
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>io.netifi.proteus.quickstart</groupId>
55
<artifactId>proteus-quickstart</artifactId>
6-
<version>1.5.3</version>
6+
<version>1.5.5</version>
77
<packaging>pom</packaging>
88
<name>multi</name>
99

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package io.netifi.proteus.quickstart.service.protobuf;
2+
3+
/**
4+
*/
5+
@javax.annotation.Generated(
6+
value = "by RSocket RPC proto compiler (version 0.2.12)",
7+
comments = "Source: io/netifi/proteus/quickstart/service/protobuf/service.proto")
8+
public interface BlockingHelloService {
9+
String SERVICE_ID = "io.netifi.proteus.quickstart.service.HelloService";
10+
String METHOD_SAY_HELLO = "SayHello";
11+
12+
/**
13+
* <pre>
14+
* Returns a Hello World Message
15+
* </pre>
16+
*/
17+
io.netifi.proteus.quickstart.service.protobuf.HelloResponse sayHello(io.netifi.proteus.quickstart.service.protobuf.HelloRequest message, io.netty.buffer.ByteBuf metadata);
18+
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package io.netifi.proteus.quickstart.service.protobuf;
2+
3+
@javax.annotation.Generated(
4+
value = "by RSocket RPC proto compiler (version 0.2.12)",
5+
comments = "Source: io/netifi/proteus/quickstart/service/protobuf/service.proto")
6+
@io.rsocket.rpc.annotations.internal.Generated(
7+
type = io.rsocket.rpc.annotations.internal.ResourceType.CLIENT,
8+
idlClass = BlockingHelloService.class)
9+
public final class BlockingHelloServiceClient implements BlockingHelloService {
10+
private final io.netifi.proteus.quickstart.service.protobuf.HelloServiceClient delegate;
11+
12+
public BlockingHelloServiceClient(io.rsocket.RSocket rSocket) {
13+
this.delegate = new io.netifi.proteus.quickstart.service.protobuf.HelloServiceClient(rSocket);
14+
}
15+
16+
public BlockingHelloServiceClient(io.rsocket.RSocket rSocket, io.micrometer.core.instrument.MeterRegistry registry) {
17+
this.delegate = new io.netifi.proteus.quickstart.service.protobuf.HelloServiceClient(rSocket, registry);
18+
}
19+
20+
@io.rsocket.rpc.annotations.internal.GeneratedMethod(returnTypeClass = io.netifi.proteus.quickstart.service.protobuf.HelloResponse.class)
21+
public io.netifi.proteus.quickstart.service.protobuf.HelloResponse sayHello(io.netifi.proteus.quickstart.service.protobuf.HelloRequest message) {
22+
return sayHello(message, io.netty.buffer.Unpooled.EMPTY_BUFFER);
23+
}
24+
25+
@java.lang.Override
26+
@io.rsocket.rpc.annotations.internal.GeneratedMethod(returnTypeClass = io.netifi.proteus.quickstart.service.protobuf.HelloResponse.class)
27+
public io.netifi.proteus.quickstart.service.protobuf.HelloResponse sayHello(io.netifi.proteus.quickstart.service.protobuf.HelloRequest message, io.netty.buffer.ByteBuf metadata) {
28+
return delegate.sayHello(message, metadata).block();
29+
}
30+
31+
}
32+
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
package io.netifi.proteus.quickstart.service.protobuf;
2+
3+
@javax.annotation.Generated(
4+
value = "by RSocket RPC proto compiler (version 0.2.12)",
5+
comments = "Source: io/netifi/proteus/quickstart/service/protobuf/service.proto")
6+
@io.rsocket.rpc.annotations.internal.Generated(
7+
type = io.rsocket.rpc.annotations.internal.ResourceType.SERVICE,
8+
idlClass = BlockingHelloService.class)
9+
@javax.inject.Named(
10+
value ="BlockingHelloServiceServer")
11+
public final class BlockingHelloServiceServer extends io.rsocket.rpc.AbstractRSocketService {
12+
private final BlockingHelloService service;
13+
private final reactor.core.scheduler.Scheduler scheduler;
14+
private final java.util.function.Function<? super org.reactivestreams.Publisher<io.rsocket.Payload>, ? extends org.reactivestreams.Publisher<io.rsocket.Payload>> sayHello;
15+
@javax.inject.Inject
16+
public BlockingHelloServiceServer(BlockingHelloService service, java.util.Optional<reactor.core.scheduler.Scheduler> scheduler, java.util.Optional<io.micrometer.core.instrument.MeterRegistry> registry) {
17+
this.scheduler = scheduler.orElse(reactor.core.scheduler.Schedulers.elastic());
18+
this.service = service;
19+
if (!registry.isPresent()) {
20+
this.sayHello = java.util.function.Function.identity();
21+
} else {
22+
this.sayHello = io.rsocket.rpc.metrics.Metrics.timed(registry.get(), "rsocket.server", "service", BlockingHelloService.SERVICE_ID, "method", BlockingHelloService.METHOD_SAY_HELLO);
23+
}
24+
25+
}
26+
27+
@java.lang.Override
28+
public String getService() {
29+
return BlockingHelloService.SERVICE_ID;
30+
}
31+
32+
@java.lang.Override
33+
public Class<?> getServiceClass() {
34+
return service.getClass();
35+
}
36+
37+
@java.lang.Override
38+
public reactor.core.publisher.Mono<Void> fireAndForget(io.rsocket.Payload payload) {
39+
return reactor.core.publisher.Mono.error(new UnsupportedOperationException("Fire and forget not implemented."));
40+
}
41+
42+
@java.lang.Override
43+
public reactor.core.publisher.Mono<io.rsocket.Payload> requestResponse(io.rsocket.Payload payload) {
44+
try {
45+
io.netty.buffer.ByteBuf metadata = payload.sliceMetadata();
46+
switch(io.rsocket.rpc.frames.Metadata.getMethod(metadata)) {
47+
case HelloService.METHOD_SAY_HELLO: {
48+
com.google.protobuf.CodedInputStream is = com.google.protobuf.CodedInputStream.newInstance(payload.getData());
49+
io.netifi.proteus.quickstart.service.protobuf.HelloRequest message = io.netifi.proteus.quickstart.service.protobuf.HelloRequest.parseFrom(is);
50+
return reactor.core.publisher.Mono.fromSupplier(() -> service.sayHello(message, metadata)).map(serializer).transform(sayHello).subscribeOn(scheduler);
51+
}
52+
default: {
53+
return reactor.core.publisher.Mono.error(new UnsupportedOperationException());
54+
}
55+
}
56+
} catch (Throwable t) {
57+
return reactor.core.publisher.Mono.error(t);
58+
} finally {
59+
payload.release();
60+
}
61+
}
62+
63+
@java.lang.Override
64+
public reactor.core.publisher.Flux<io.rsocket.Payload> requestStream(io.rsocket.Payload payload) {
65+
return reactor.core.publisher.Flux.error(new UnsupportedOperationException("Request-Stream not implemented."));
66+
}
67+
68+
@java.lang.Override
69+
public reactor.core.publisher.Flux<io.rsocket.Payload> requestChannel(io.rsocket.Payload payload, reactor.core.publisher.Flux<io.rsocket.Payload> publisher) {
70+
return reactor.core.publisher.Flux.error(new UnsupportedOperationException("Request-Channel not implemented."));
71+
}
72+
73+
@java.lang.Override
74+
public reactor.core.publisher.Flux<io.rsocket.Payload> requestChannel(org.reactivestreams.Publisher<io.rsocket.Payload> payloads) {
75+
return reactor.core.publisher.Flux.error(new UnsupportedOperationException("Request-Channel not implemented."));
76+
}
77+
78+
private static final java.util.function.Function<com.google.protobuf.MessageLite, io.rsocket.Payload> serializer =
79+
new java.util.function.Function<com.google.protobuf.MessageLite, io.rsocket.Payload>() {
80+
@java.lang.Override
81+
public io.rsocket.Payload apply(com.google.protobuf.MessageLite message) {
82+
int length = message.getSerializedSize();
83+
io.netty.buffer.ByteBuf byteBuf = io.netty.buffer.ByteBufAllocator.DEFAULT.buffer(length);
84+
try {
85+
message.writeTo(com.google.protobuf.CodedOutputStream.newInstance(byteBuf.internalNioBuffer(0, length)));
86+
byteBuf.writerIndex(length);
87+
return io.rsocket.util.ByteBufPayload.create(byteBuf);
88+
} catch (Throwable t) {
89+
byteBuf.release();
90+
throw new RuntimeException(t);
91+
}
92+
}
93+
};
94+
95+
private static <T> java.util.function.Function<io.rsocket.Payload, T> deserializer(final com.google.protobuf.Parser<T> parser) {
96+
return new java.util.function.Function<io.rsocket.Payload, T>() {
97+
@java.lang.Override
98+
public T apply(io.rsocket.Payload payload) {
99+
try {
100+
com.google.protobuf.CodedInputStream is = com.google.protobuf.CodedInputStream.newInstance(payload.getData());
101+
return parser.parseFrom(is);
102+
} catch (Throwable t) {
103+
throw new RuntimeException(t);
104+
} finally {
105+
payload.release();
106+
}
107+
}
108+
};
109+
}
110+
}

0 commit comments

Comments
 (0)