Skip to content

Commit 9708f3d

Browse files
yschimkeyschimke
authored
Google Java Code Formatter (rsocket#303)
* configure google formatter * format one package * reformat one file via plugin
1 parent 76005e7 commit 9708f3d

6 files changed

Lines changed: 360 additions & 329 deletions

File tree

‎README.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ dependencies {
3333

3434
No releases to Maven Central or JCenter have occurred yet.
3535

36+
## Development
37+
38+
Install the google-java-format in Intellij, from Plugins preferences.
39+
Enable under Preferences -> Other Settings -> google-java-format Settings
40+
41+
Format automatically with
42+
43+
```
44+
$./gradlew goJF
45+
```
3646

3747
## Debugging
3848
Frames can be printed out to help debugging. Set the logger `io.rsocket.FrameLogger` to debug to print the frames.

‎build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ buildscript {
2020
}
2121
}
2222

23+
plugins {
24+
id 'com.github.sherter.google-java-format' version '0.6'
25+
}
26+
2327
description = 'RSocket: stream oriented messaging passing with Reactive Stream semantics.'
2428

2529
apply plugin: 'reactivesocket-project'

‎rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/stream/StreamingClient.java‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,7 @@
1313

1414
package io.rsocket.examples.transport.tcp.stream;
1515

16-
import io.rsocket.AbstractRSocket;
17-
import io.rsocket.ConnectionSetupPayload;
18-
import io.rsocket.Payload;
19-
import io.rsocket.RSocket;
20-
import io.rsocket.RSocketFactory;
21-
import io.rsocket.SocketAcceptor;
16+
import io.rsocket.*;
2217
import io.rsocket.transport.netty.client.TcpClientTransport;
2318
import io.rsocket.transport.netty.server.TcpServerTransport;
2419
import io.rsocket.util.PayloadImpl;
@@ -30,38 +25,39 @@
3025

3126
public final class StreamingClient {
3227

33-
public static void main(String[] args) {
34-
RSocketFactory
35-
.receive()
36-
.acceptor(new SocketAcceptorImpl())
37-
.transport(TcpServerTransport.create("localhost", 7000))
38-
.start()
39-
.subscribe();
28+
public static void main(String[] args) {
29+
RSocketFactory.receive()
30+
.acceptor(new SocketAcceptorImpl())
31+
.transport(TcpServerTransport.create("localhost", 7000))
32+
.start()
33+
.subscribe();
4034

41-
RSocket socket = RSocketFactory
42-
.connect()
35+
RSocket socket =
36+
RSocketFactory.connect()
4337
.transport(TcpClientTransport.create("localhost", 7000))
4438
.start()
4539
.block();
4640

47-
socket.requestStream(new PayloadImpl("Hello"))
48-
.map(payload -> StandardCharsets.UTF_8.decode(payload.getData()).toString())
49-
.doOnNext(System.out::println)
50-
.take(10)
51-
.thenEmpty(socket.close())
52-
.block();
53-
}
54-
55-
private static class SocketAcceptorImpl implements SocketAcceptor {
56-
@Override
57-
public Mono<RSocket> accept(ConnectionSetupPayload setupPayload, RSocket reactiveSocket) {
58-
return Mono.just(new AbstractRSocket() {
59-
@Override
60-
public Flux<Payload> requestStream(Payload payload) {
61-
return Flux.interval(Duration.ofMillis(100))
62-
.map(aLong -> new PayloadImpl("Interval: " + aLong));
63-
}
64-
});
65-
}
41+
socket
42+
.requestStream(new PayloadImpl("Hello"))
43+
.map(payload -> StandardCharsets.UTF_8.decode(payload.getData()).toString())
44+
.doOnNext(System.out::println)
45+
.take(10)
46+
.thenEmpty(socket.close())
47+
.block();
48+
}
49+
50+
private static class SocketAcceptorImpl implements SocketAcceptor {
51+
@Override
52+
public Mono<RSocket> accept(ConnectionSetupPayload setupPayload, RSocket reactiveSocket) {
53+
return Mono.just(
54+
new AbstractRSocket() {
55+
@Override
56+
public Flux<Payload> requestStream(Payload payload) {
57+
return Flux.interval(Duration.ofMillis(100))
58+
.map(aLong -> new PayloadImpl("Interval: " + aLong));
59+
}
60+
});
6661
}
62+
}
6763
}

‎rsocket-spectator/src/main/java/io/rsocket/spectator/SpectatorFrameInterceptor.java‎

Lines changed: 122 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -10,135 +10,136 @@
1010
import reactor.core.publisher.Flux;
1111
import reactor.core.publisher.Mono;
1212

13-
/**
14-
* An implementation of {@link Plugins.DuplexConnectionInterceptor} that uses Spectator
15-
*/
13+
/** An implementation of {@link Plugins.DuplexConnectionInterceptor} that uses Spectator */
1614
public class SpectatorFrameInterceptor implements Plugins.DuplexConnectionInterceptor {
17-
private final Registry registry;
15+
private final Registry registry;
1816

19-
public SpectatorFrameInterceptor(Registry registry) {
20-
this.registry = registry;
21-
}
17+
public SpectatorFrameInterceptor(Registry registry) {
18+
this.registry = registry;
19+
}
2220

23-
@Override
24-
public DuplexConnection apply(Type type, DuplexConnection connection) {
25-
return new DuplexConnection() {
26-
Counter cancelCounter = registry.counter(FrameType.CANCEL.name(), type.name());
27-
Counter requestChannelCounter = registry.counter(FrameType.REQUEST_CHANNEL.name(), type.name());
28-
Counter completeCounter = registry.counter(FrameType.COMPLETE.name(), type.name());
29-
Counter errorCounter = registry.counter(FrameType.ERROR.name(), type.name());
30-
Counter extCounter = registry.counter(FrameType.EXT.name(), type.name());
31-
Counter fireAndForgetCounter = registry.counter(FrameType.FIRE_AND_FORGET.name(), type.name());
32-
Counter keepAliveCounter = registry.counter(FrameType.KEEPALIVE.name(), type.name());
33-
Counter leaseCounter = registry.counter(FrameType.LEASE.name(), type.name());
34-
Counter metadataPushCounter = registry.counter(FrameType.METADATA_PUSH.name(), type.name());
35-
Counter nextCounter = registry.counter(FrameType.NEXT.name(), type.name());
36-
Counter nextCompleteCounter = registry.counter(FrameType.NEXT_COMPLETE.name(), type.name());
37-
Counter payloadCounter = registry.counter(FrameType.PAYLOAD.name(), type.name());
38-
Counter requestNCounter = registry.counter(FrameType.REQUEST_N.name(), type.name());
39-
Counter requestResponseCounter = registry.counter(FrameType.REQUEST_RESPONSE.name(), type.name());
40-
Counter requestStreamCounter = registry.counter(FrameType.REQUEST_STREAM.name(), type.name());
41-
Counter resumeCounter = registry.counter(FrameType.RESUME.name(), type.name());
42-
Counter resumeOkCounter = registry.counter(FrameType.RESUME_OK.name(), type.name());
43-
Counter setupCounter = registry.counter(FrameType.SETUP.name(), type.name());
44-
Counter undefinedCounter = registry.counter(FrameType.UNDEFINED.name(), type.name());
21+
@Override
22+
public DuplexConnection apply(Type type, DuplexConnection connection) {
23+
return new DuplexConnection() {
24+
Counter cancelCounter = registry.counter(FrameType.CANCEL.name(), type.name());
25+
Counter requestChannelCounter =
26+
registry.counter(FrameType.REQUEST_CHANNEL.name(), type.name());
27+
Counter completeCounter = registry.counter(FrameType.COMPLETE.name(), type.name());
28+
Counter errorCounter = registry.counter(FrameType.ERROR.name(), type.name());
29+
Counter extCounter = registry.counter(FrameType.EXT.name(), type.name());
30+
Counter fireAndForgetCounter =
31+
registry.counter(FrameType.FIRE_AND_FORGET.name(), type.name());
32+
Counter keepAliveCounter = registry.counter(FrameType.KEEPALIVE.name(), type.name());
33+
Counter leaseCounter = registry.counter(FrameType.LEASE.name(), type.name());
34+
Counter metadataPushCounter = registry.counter(FrameType.METADATA_PUSH.name(), type.name());
35+
Counter nextCounter = registry.counter(FrameType.NEXT.name(), type.name());
36+
Counter nextCompleteCounter = registry.counter(FrameType.NEXT_COMPLETE.name(), type.name());
37+
Counter payloadCounter = registry.counter(FrameType.PAYLOAD.name(), type.name());
38+
Counter requestNCounter = registry.counter(FrameType.REQUEST_N.name(), type.name());
39+
Counter requestResponseCounter =
40+
registry.counter(FrameType.REQUEST_RESPONSE.name(), type.name());
41+
Counter requestStreamCounter = registry.counter(FrameType.REQUEST_STREAM.name(), type.name());
42+
Counter resumeCounter = registry.counter(FrameType.RESUME.name(), type.name());
43+
Counter resumeOkCounter = registry.counter(FrameType.RESUME_OK.name(), type.name());
44+
Counter setupCounter = registry.counter(FrameType.SETUP.name(), type.name());
45+
Counter undefinedCounter = registry.counter(FrameType.UNDEFINED.name(), type.name());
4546

46-
@Override
47-
public Mono<Void> send(Publisher<Frame> frame) {
48-
return connection.send(Flux.from(frame).doOnNext(this::count));
49-
}
47+
@Override
48+
public Mono<Void> send(Publisher<Frame> frame) {
49+
return connection.send(Flux.from(frame).doOnNext(this::count));
50+
}
5051

51-
@Override
52-
public Mono<Void> sendOne(Frame frame) {
53-
return Mono
54-
.defer(() -> {
55-
count(frame);
56-
return connection.sendOne(frame);
57-
});
58-
}
52+
@Override
53+
public Mono<Void> sendOne(Frame frame) {
54+
return Mono.defer(
55+
() -> {
56+
count(frame);
57+
return connection.sendOne(frame);
58+
});
59+
}
5960

60-
@Override
61-
public Flux<Frame> receive() {
62-
return connection.receive().doOnNext(this::count);
63-
}
61+
@Override
62+
public Flux<Frame> receive() {
63+
return connection.receive().doOnNext(this::count);
64+
}
6465

65-
@Override
66-
public Mono<Void> close() {
67-
return connection.close();
68-
}
66+
@Override
67+
public Mono<Void> close() {
68+
return connection.close();
69+
}
6970

70-
@Override
71-
public Mono<Void> onClose() {
72-
return connection.onClose();
73-
}
71+
@Override
72+
public Mono<Void> onClose() {
73+
return connection.onClose();
74+
}
7475

75-
@Override
76-
public double availability() {
77-
return connection.availability();
78-
}
76+
@Override
77+
public double availability() {
78+
return connection.availability();
79+
}
7980

80-
private void count(Frame frame) {
81-
switch (frame.getType()) {
82-
case CANCEL:
83-
cancelCounter.increment();
84-
break;
85-
case REQUEST_CHANNEL:
86-
requestChannelCounter.increment();
87-
break;
88-
case COMPLETE:
89-
completeCounter.increment();
90-
break;
91-
case ERROR:
92-
errorCounter.increment();
93-
break;
94-
case EXT:
95-
extCounter.increment();
96-
break;
97-
case FIRE_AND_FORGET:
98-
fireAndForgetCounter.increment();
99-
break;
100-
case KEEPALIVE:
101-
keepAliveCounter.increment();
102-
break;
103-
case LEASE:
104-
leaseCounter.increment();
105-
break;
106-
case METADATA_PUSH:
107-
metadataPushCounter.increment();
108-
break;
109-
case NEXT:
110-
nextCounter.increment();
111-
break;
112-
case NEXT_COMPLETE:
113-
nextCompleteCounter.increment();
114-
break;
115-
case PAYLOAD:
116-
payloadCounter.increment();
117-
break;
118-
case REQUEST_N:
119-
requestNCounter.increment();
120-
break;
121-
case REQUEST_RESPONSE:
122-
requestResponseCounter.increment();
123-
break;
124-
case REQUEST_STREAM:
125-
requestStreamCounter.increment();
126-
break;
127-
case RESUME:
128-
resumeCounter.increment();
129-
break;
130-
case RESUME_OK:
131-
resumeOkCounter.increment();
132-
break;
133-
case SETUP:
134-
setupCounter.increment();
135-
break;
136-
case UNDEFINED:
137-
default:
138-
undefinedCounter.increment();
139-
break;
140-
}
141-
}
142-
};
143-
}
81+
private void count(Frame frame) {
82+
switch (frame.getType()) {
83+
case CANCEL:
84+
cancelCounter.increment();
85+
break;
86+
case REQUEST_CHANNEL:
87+
requestChannelCounter.increment();
88+
break;
89+
case COMPLETE:
90+
completeCounter.increment();
91+
break;
92+
case ERROR:
93+
errorCounter.increment();
94+
break;
95+
case EXT:
96+
extCounter.increment();
97+
break;
98+
case FIRE_AND_FORGET:
99+
fireAndForgetCounter.increment();
100+
break;
101+
case KEEPALIVE:
102+
keepAliveCounter.increment();
103+
break;
104+
case LEASE:
105+
leaseCounter.increment();
106+
break;
107+
case METADATA_PUSH:
108+
metadataPushCounter.increment();
109+
break;
110+
case NEXT:
111+
nextCounter.increment();
112+
break;
113+
case NEXT_COMPLETE:
114+
nextCompleteCounter.increment();
115+
break;
116+
case PAYLOAD:
117+
payloadCounter.increment();
118+
break;
119+
case REQUEST_N:
120+
requestNCounter.increment();
121+
break;
122+
case REQUEST_RESPONSE:
123+
requestResponseCounter.increment();
124+
break;
125+
case REQUEST_STREAM:
126+
requestStreamCounter.increment();
127+
break;
128+
case RESUME:
129+
resumeCounter.increment();
130+
break;
131+
case RESUME_OK:
132+
resumeOkCounter.increment();
133+
break;
134+
case SETUP:
135+
setupCounter.increment();
136+
break;
137+
case UNDEFINED:
138+
default:
139+
undefinedCounter.increment();
140+
break;
141+
}
142+
}
143+
};
144+
}
144145
}

0 commit comments

Comments
 (0)