8000 cleanup (#361) · chakra-coder/rsocket-java@b07e663 · GitHub
[go: up one dir, main page]
Skip to content

Commit b07e663

Browse files
yschimkeyschimke
authored
cleanup (rsocket#361)
1 parent 15c95f7 commit b07e663

File tree

11 files changed

+6
-35
lines changed

11 files changed

+6
-35
lines changed

‎rsocket-core/src/main/java/io/rsocket/RSocketClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import io.rsocket.internal.LimitableRequestPublisher;
2626
import io.rsocket.util.PayloadImpl;
2727
import java.nio.channels.ClosedChannelException;
28-
import java.nio.charset.StandardCharsets;
2928
import java.time.Duration;
3029
import java.util.concurrent.atomic.AtomicInteger;
3130
import java.util.function.Consumer;

‎rsocket-core/src/main/java/io/rsocket/exceptions/Exceptions.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import static io.rsocket.frame.ErrorFrameFlyweight.*;
1919

2020
import io.rsocket.Frame;
21-
import java.nio.charset.StandardCharsets;
2221

2322
public class Exceptions {
2423

‎rsocket-core/src/test/java/io/rsocket/util/PayloadImplTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public void testReuseWithExternalMark() throws Exception {
3939

4040
public void assertDataAndMetadata(PayloadImpl p) {
4141
assertThat("Unexpected data.", p.getDataUtf8(), equalTo(DATA_VAL));
42-
assertThat(
43-
"Unexpected metadata.", p.getMetadataUtf8(), equalTo(METADATA_VAL));
42+
assertThat("Unexpected metadata.", p.getMetadataUtf8(), equalTo(METADATA_VAL));
4443
}
4544
}

‎rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/channel/ChannelEchoClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.rsocket.transport.netty.client.TcpClientTransport;
2323
import io.rsocket.transport.netty.server.TcpServerTransport;
2424
import io.rsocket.util.PayloadImpl;
25-
import java.nio.charset.StandardCharsets;
2625
import java.time.Duration;
2726
import org.reactivestreams.Publisher;
2827
import reactor.core.publisher.Flux;

‎rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/duplex/DuplexClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import io.rsocket.transport.netty.client.TcpClientTransport;
2121
import io.rsocket.transport.netty.server.TcpServerTransport;
2222
import io.rsocket.util.PayloadImpl;
23-
import java.nio.charset.StandardCharsets;
2423
import java.time.Duration;
2524
import reactor.core.publisher.Flux;
2625
import reactor.core.publisher.Mono;

‎rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/requestresponse/HelloWorldClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.rsocket.transport.netty.client.TcpClientTransport;
2424
import io.rsocket.transport.netty.server.TcpServerTransport;
2525
import io.rsocket.util.PayloadImpl;
26-
import java.nio.charset.StandardCharsets;
2726
import reactor.core.publisher.Mono;
2827

2928
public final class HelloWorldClient {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.rsocket.transport.netty.client.TcpClientTransport;
1818
import io.rsocket.transport.netty.server.TcpServerTransport;
1919
import io.rsocket.util.PayloadImpl;
20-
import java.nio.charset.StandardCharsets;
2120
import java.time.Duration;
2221
import reactor.core.publisher.Flux;
2322
import reactor.core.publisher.Mono;

‎rsocket-examples/src/test/java/io/rsocket/integration/TcpIntegrationTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import io.rsocket.transport.netty.server.TcpServerTransport;
3030
import io.rsocket.util.PayloadImpl;
3131
import io.rsocket.util.RSocketProxy;
32-
import java.nio.charset.StandardCharsets;
3332
import java.util.concurrent.ConcurrentHashMap;
3433
import java.util.concurrent.CountDownLatch;
3534
import org.junit.After;

‎rsocket-tck-drivers/src/main/java/io/rsocket/tckdrivers/common/MySubscriber.java

Lines changed: 1 addition & 3 deletions
< F438 tr class="diff-line-row">
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import io.reactivex.subscribers.TestSubscriber;
2525
import io.rsocket.Payload;
26-
import java.nio.charset.StandardCharsets;
2726
import java.util.List;
2827
import java.util.concurrent.CountDownLatch;
2928
import java.util.concurrent.TimeUnit;
@@ -125,8 +124,7 @@ public final void assertValues(List<Tuple<String, String>> values) {
125124

126125
for (int i = 0; i < values.size(); i++) {
127126
Payload p = (Payload) this.values().get(i);
128-
Tuple<String, String> v =
129-
new Tuple<>(p.getDataUtf8(), p.getMetadataUtf8());
127+
Tuple<String, String> v = new Tuple<>(p.getDataUtf8(), p.getMetadataUtf8());
130128
Tuple<String, String> u = values.get(i);
131129
String msg = prefix + "Values at position %d differ; ";
132130
assertEquals(String.format(msg, i), u, v);

‎rsocket-test/src/main/java/io/rsocket/test/BaseClientServerTest.java

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import io.rsocket.Payload;
2222
import io.rsocket.util.PayloadImpl;
23-
import java.nio.charset.StandardCharsets;
2423
import org.junit.Rule;
2524
import org.junit.Test;
2625
import reactor.core.publisher.Flux;
@@ -59,12 +58,7 @@ public void testRequestResponse1() {
5958
long outputCount =
6059
Flux.range(1, 1)
6160
.flatMap(
62-
i ->
63-
setup
64-
.getRSocket()
65-
.requestResponse(testPayload(i))
66-
.map(Payload::getDataUtf8))
67-
61+
i -> setup.getRSocket().requestResponse(testPayload(i)).map(Payload::getDataUtf8))
6862
.doOnError(Throwable::printStackTrace)
6963
.count()
7064
.block();
@@ -77,11 +71,7 @@ public void testRequestResponse10() {
7771
long outputCount =
7872
Flux.range(1, 10)
7973
.flatMap(
80-
i ->
81-
setup
82-
.getRSocket()
83-
.requestResponse(testPayload(i))
84-
.map(Payload::getDataUtf8))
74+
i -> setup.getRSocket().requestResponse(testPayload(i)).map(Payload::getDataUtf8))
8575
.doOnError(Throwable::printStackTrace)
8676
.count()
8777
.block();
@@ -110,11 +100,7 @@ public void testRequestResponse100() {
110100
long outputCount =
111101
Flux.range(1, 100)
112102
.flatMap(
113-
i ->
114-
setup
115-
.getRSocket()
116-
.requestResponse(testPayload(i))
117-
.map(Payload::getDataUtf8))
103+
i -> setup.getRSocket().requestResponse(testPayload(i)).map(Payload::getDataUtf8))
118104
.doOnError(Throwable::printStackTrace)
119105
.count()
120106
.block();
@@ -127,11 +113,7 @@ public void testRequestResponse10_000() {
127113
long outputCount =
128114
Flux.range(1, 10_000)
129115
.flatMap(
130-
i ->
131-
setup
132-
.getRSocket()
133-
.requestResponse(testPayload(i))
134-
.map(Payload::getDataUtf8))
116+
i -> setup.getRSocket().requestResponse(testPayload(i)).map(Payload::getDataUtf8))
135117
.doOnError(Throwable::printStackTrace)
136118
.count()
137119
.block();

‎rsocket-transport-aeron/src/test/java/io/rsocket/aeron/ClientServerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import io.rsocket.Payload;
2121
import io.rsocket.test.ClientSetupRule;
2222
import io.rsocket.util.PayloadImpl;
23-
import java.nio.charset.StandardCharsets;
2423
import org.junit.Ignore;
2524
import org.junit.Rule;
2625
import org.junit.Test;

0 commit comments

Comments
 (0)
0