cleanup (rsocket#361)

yschimke · web-flow · commit b07e663fbc80 · 2017-07-24T09:14:33.000+01:00
diff --git a/rsocket-core/src/main/java/io/rsocket/RSocketClient.java b/rsocket-core/src/main/java/io/rsocket/RSocketClient.java
@@ -25,7 +25,6 @@
 import io.rsocket.internal.LimitableRequestPublisher;
 import io.rsocket.util.PayloadImpl;
 import java.nio.channels.ClosedChannelException;
-import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
diff --git a/rsocket-core/src/main/java/io/rsocket/exceptions/Exceptions.java b/rsocket-core/src/main/java/io/rsocket/exceptions/Exceptions.java
@@ -18,7 +18,6 @@
 import static io.rsocket.frame.ErrorFrameFlyweight.*;
 
 import io.rsocket.Frame;
-import java.nio.charset.StandardCharsets;
 
 public class Exceptions {
 
diff --git a/rsocket-core/src/test/java/io/rsocket/util/PayloadImplTest.java b/rsocket-core/src/test/java/io/rsocket/util/PayloadImplTest.java
@@ -39,7 +39,6 @@ public void testReuseWithExternalMark() throws Exception {
 
   public void assertDataAndMetadata(PayloadImpl p) {
     assertThat("Unexpected data.", p.getDataUtf8(), equalTo(DATA_VAL));
-    assertThat(
-        "Unexpected metadata.", p.getMetadataUtf8(), equalTo(METADATA_VAL));
+    assertThat("Unexpected metadata.", p.getMetadataUtf8(), equalTo(METADATA_VAL));
   }
 }
diff --git a/rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/channel/ChannelEchoClient.java b/rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/channel/ChannelEchoClient.java
@@ -22,7 +22,6 @@
 import io.rsocket.transport.netty.client.TcpClientTransport;
 import io.rsocket.transport.netty.server.TcpServerTransport;
 import io.rsocket.util.PayloadImpl;
-import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
diff --git a/rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/duplex/DuplexClient.java b/rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/duplex/DuplexClient.java
@@ -20,7 +20,6 @@
 import io.rsocket.transport.netty.client.TcpClientTransport;
 import io.rsocket.transport.netty.server.TcpServerTransport;
 import io.rsocket.util.PayloadImpl;
-import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
diff --git a/rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/requestresponse/HelloWorldClient.java b/rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/requestresponse/HelloWorldClient.java
@@ -23,7 +23,6 @@
 import io.rsocket.transport.netty.client.TcpClientTransport;
 import io.rsocket.transport.netty.server.TcpServerTransport;
 import io.rsocket.util.PayloadImpl;
-import java.nio.charset.StandardCharsets;
 import reactor.core.publisher.Mono;
 
 public final class HelloWorldClient {
diff --git a/rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/stream/StreamingClient.java b/rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/stream/StreamingClient.java
@@ -17,7 +17,6 @@
 import io.rsocket.transport.netty.client.TcpClientTransport;
 import io.rsocket.transport.netty.server.TcpServerTransport;
 import io.rsocket.util.PayloadImpl;
-import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
diff --git a/rsocket-examples/src/test/java/io/rsocket/integration/TcpIntegrationTest.java b/rsocket-examples/src/test/java/io/rsocket/integration/TcpIntegrationTest.java
@@ -29,7 +29,6 @@
 import io.rsocket.transport.netty.server.TcpServerTransport;
 import io.rsocket.util.PayloadImpl;
 import io.rsocket.util.RSocketProxy;
-import java.nio.charset.StandardCharsets;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import org.junit.After;
diff --git a/rsocket-tck-drivers/src/main/java/io/rsocket/tckdrivers/common/MySubscriber.java b/rsocket-tck-drivers/src/main/java/io/rsocket/tckdrivers/common/MySubscriber.java
@@ -23,7 +23,6 @@
 
 import io.reactivex.subscribers.TestSubscriber;
 import io.rsocket.Payload;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -125,8 +124,7 @@ public final void assertValues(List<Tuple<String, String>> values) {
 
     for (int i = 0; i < values.size(); i++) {
       Payload p = (Payload) this.values().get(i);
-      Tuple<String, String> v =
-          new Tuple<>(p.getDataUtf8(), p.getMetadataUtf8());
+      Tuple<String, String> v = new Tuple<>(p.getDataUtf8(), p.getMetadataUtf8());
       Tuple<String, String> u = values.get(i);
       String msg = prefix + "Values at position %d differ; ";
       assertEquals(String.format(msg, i), u, v);
diff --git a/rsocket-test/src/main/java/io/rsocket/test/BaseClientServerTest.java b/rsocket-test/src/main/java/io/rsocket/test/BaseClientServerTest.java
@@ -20,7 +20,6 @@
 
 import io.rsocket.Payload;
 import io.rsocket.util.PayloadImpl;
-import java.nio.charset.StandardCharsets;
 import org.junit.Rule;
 import org.junit.Test;
 import reactor.core.publisher.Flux;
@@ -59,12 +58,7 @@ public void testRequestResponse1() {
     long outputCount =
         Flux.range(1, 1)
             .flatMap(
-                i ->
-                    setup
-                        .getRSocket()
-                        .requestResponse(testPayload(i))
-                        .map(Payload::getDataUtf8))
-
+                i -> setup.getRSocket().requestResponse(testPayload(i)).map(Payload::getDataUtf8))
             .doOnError(Throwable::printStackTrace)
             .count()
             .block();
@@ -77,11 +71,7 @@ public void testRequestResponse10() {
     long outputCount =
         Flux.range(1, 10)
             .flatMap(
-                i ->
-                    setup
-                        .getRSocket()
-                        .requestResponse(testPayload(i))
-                        .map(Payload::getDataUtf8))
+                i -> setup.getRSocket().requestResponse(testPayload(i)).map(Payload::getDataUtf8))
             .doOnError(Throwable::printStackTrace)
             .count()
             .block();
@@ -110,11 +100,7 @@ public void testRequestResponse100() {
     long outputCount =
         Flux.range(1, 100)
             .flatMap(
-                i ->
-                    setup
-                        .getRSocket()
-                        .requestResponse(testPayload(i))
-                        .map(Payload::getDataUtf8))
+                i -> setup.getRSocket().requestResponse(testPayload(i)).map(Payload::getDataUtf8))
             .doOnError(Throwable::printStackTrace)
             .count()
             .block();
@@ -127,11 +113,7 @@ public void testRequestResponse10_000() {
     long outputCount =
         Flux.range(1, 10_000)
             .flatMap(
-                i ->
-                    setup
-                        .getRSocket()
-                        .requestResponse(testPayload(i))
-                        .map(Payload::getDataUtf8))
+                i -> setup.getRSocket().requestResponse(testPayload(i)).map(Payload::getDataUtf8))
             .doOnError(Throwable::printStackTrace)
             .count()
             .block();
diff --git a/rsocket-transport-aeron/src/test/java/io/rsocket/aeron/ClientServerTest.java b/rsocket-transport-aeron/src/test/java/io/rsocket/aeron/ClientServerTest.java
@@ -20,7 +20,6 @@
 import io.rsocket.Payload;
 import io.rsocket.test.ClientSetupRule;
 import io.rsocket.util.PayloadImpl;
-import java.nio.charset.StandardCharsets;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ public void testReuseWithExternalMark() throws Exception {`
`39`	`39`
`40`	`40`	`public void assertDataAndMetadata(PayloadImpl p) {`
`41`	`41`	`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));`
`44`	`43`	`}`
`45`	`44`	`}`