simplify data flow (rsocket#388)

qweek · yschimke · commit 615628ee46af · 2017-09-14T07:07:54.000+01:00
replace 'while' loop with 'foreach'
replace loop with Collection.removeIf()
replace 'if' with 'switch'
replace string concatenation to 'StringBuilder.append()' call
remove redundant variable initializer
remove redundant local variable
diff --git a/rsocket-core/src/main/java/io/rsocket/Frame.java b/rsocket-core/src/main/java/io/rsocket/Frame.java
@@ -631,13 +631,8 @@ public static void ensureFrameType(final FrameType frameType, final Frame frame)
 
   @Override
   public String toString() {
-    FrameType type = FrameType.UNDEFINED;
+    FrameType type = FrameHeaderFlyweight.frameType(content);
     StringBuilder payload = new StringBuilder();
-    long streamId = -1;
-    String additionalFlags = "";
-
-    type = FrameHeaderFlyweight.frameType(content);
-
     @Nullable ByteBuf metadata = FrameHeaderFlyweight.sliceFrameMetadata(content);
 
     if (metadata != null) {
@@ -652,8 +647,9 @@ public String toString() {
       payload.append(String.format("data: \"%s\" ", data.toString(StandardCharsets.UTF_8)));
     }
 
-    streamId = FrameHeaderFlyweight.streamId(content);
+    long streamId = FrameHeaderFlyweight.streamId(content);
 
+    String additionalFlags = "";
     switch (type) {
       case LEASE:
         additionalFlags = " Permits: " + Lease.numberOfRequests(this) + " TTL: " + Lease.ttl(this);
@@ -691,7 +687,7 @@ public String toString() {
         + streamId
         + " Type: "
         + type
-        + (!additionalFlags.isEmpty() ? additionalFlags : "")
+        + additionalFlags
         + " Payload: "
         + payload;
   }
diff --git a/rsocket-core/src/main/java/io/rsocket/resume/ResumeCache.java b/rsocket-core/src/main/java/io/rsocket/resume/ResumeCache.java
@@ -81,11 +81,7 @@ public Flux<Frame> resend(int remotePosition) {
 
     List<Frame> resend = new ArrayList<>();
 
-    Iterator<Map.Entry<Integer, Frame>> positions = frames.entrySet().iterator();
-
-    while (positions.hasNext()) {
-      Map.Entry<Integer, Frame> cachePosition = positions.next();
-
+    for (Map.Entry<Integer, Frame> cachePosition : frames.entrySet()) {
       if (remotePosition < cachePosition.getKey()) {
         resend.add(cachePosition.getValue());
       }
diff --git a/rsocket-load-balancer/src/main/java/io/rsocket/client/LoadBalancedRSocketMono.java b/rsocket-load-balancer/src/main/java/io/rsocket/client/LoadBalancedRSocketMono.java
@@ -583,7 +583,10 @@ public void onNext(Collection<RSocketSupplier> newFactories) {
 
         if (changed && logger.isDebugEnabled()) {
           StringBuilder msgBuilder = new StringBuilder();
-          msgBuilder.append("\nUpdated active factories (size: " + activeFactories.size() + ")\n");
+          msgBuilder
+              .append("\nUpdated active factories (size: ")
+              .append(activeFactories.size())
+              .append(")\n");
           for (RSocketSupplier f : activeFactories) {
             msgBuilder.append(" + ").append(f).append('\n');
           }
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
@@ -192,8 +192,7 @@ public final void take(long n) {
   public Tuple<String, String> getElement(int n) {
     assert (n < values.size());
     Payload p = (Payload) values().get(n);
-    Tuple<String, String> tup = new Tuple<>(p.getDataUtf8(), p.getMetadataUtf8());
-    return tup;
+    return new Tuple<>(p.getDataUtf8(), p.getMetadataUtf8());
   }
 
   public final void setEcho(EchoSubscription echosub) {
diff --git a/rsocket-tck-drivers/src/main/java/io/rsocket/tckdrivers/runner/Transports.java b/rsocket-tck-drivers/src/main/java/io/rsocket/tckdrivers/runner/Transports.java
@@ -23,16 +23,17 @@ public static int nettyPort(Closeable closeable) {
   }
 
   public static String urlForTransport(String transport) {
-    if (transport.equals("local")) {
-      return "local:tck" + localCounter.incrementAndGet();
-    } else if (transport.equals("tcp")) {
-      // TODO get external IP?
-      return "tcp://localhost:0";
-    } else if (transport.equals("ws")) {
-      // TODO get external IP?
-      return "ws://localhost:0";
-    } else {
-      throw new UnsupportedOperationException("unknown transport '" + transport + "'");
+    switch (transport) {
+      case "local":
+        return "local:tck" + localCounter.incrementAndGet();
+      case "tcp":
+        // TODO get external IP?
+        return "tcp://localhost:0";
+      case "ws":
+        // TODO get external IP?
+        return "ws://localhost:0";
+      default:
+        throw new UnsupportedOperationException("unknown transport '" + transport + "'");
     }
   }
 }
diff --git a/rsocket-test/src/main/java/io/rsocket/test/BaseClientServerTest.java b/rsocket-test/src/main/java/io/rsocket/test/BaseClientServerTest.java
@@ -80,7 +80,7 @@ public void testRequestResponse10() {
   }
 
   private PayloadImpl testPayload(int metadataPresent) {
-    String metadata = null;
+    String metadata;
     switch (metadataPresent % 5) {
       case 0:
         metadata = null;
diff --git a/rsocket-transport-aeron/src/main/java/io/rsocket/aeron/internal/DefaultAeronWrapper.java b/rsocket-transport-aeron/src/main/java/io/rsocket/aeron/internal/DefaultAeronWrapper.java
@@ -70,13 +70,6 @@ private void availableImageHandler(Image image) {
   }
 
   private void unavailableImageHandler(Image image) {
-    Iterator<Function<Image, Boolean>> iterator = unavailableImageHandlers.iterator();
-
-    while (iterator.hasNext()) {
-      Function<Image, Boolean> handler = iterator.next();
-      if (handler.apply(image)) {
-        iterator.remove();
-      }
-    }
+    unavailableImageHandlers.removeIf(handler -> handler.apply(image));
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -192,8 +192,7 @@ public final void take(long n) {`
`192`	`192`	`public Tuple<String, String> getElement(int n) {`
`193`	`193`	`assert (n < values.size());`
`194`	`194`	`Payload p = (Payload) values().get(n);`
`195`		`- Tuple<String, String> tup = new Tuple<>(p.getDataUtf8(), p.getMetadataUtf8());`
`196`		`- return tup;`
	`195`	`+ return new Tuple<>(p.getDataUtf8(), p.getMetadataUtf8());`
`197`	`196`	`}`
`198`	`197`
`199`	`198`	`public final void setEcho(EchoSubscription echosub) {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public void testRequestResponse10() {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`private PayloadImpl testPayload(int metadataPresent) {`
`83`		`- String metadata = null;`
	`83`	`+ String metadata;`
`84`	`84`	`switch (metadataPresent % 5) {`
`85`	`85`	`case 0:`
`86`	`86`	`metadata = null;`
Original file line number	Diff line number	Diff line change
`@@ -70,13 +70,6 @@ private void availableImageHandler(Image image) {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`private void unavailableImageHandler(Image image) {`
`73`		`- Iterator<Function<Image, Boolean>> iterator = unavailableImageHandlers.iterator();`
`74`		`-`
`75`		`- while (iterator.hasNext()) {`
`76`		`- Function<Image, Boolean> handler = iterator.next();`
`77`		`- if (handler.apply(image)) {`
`78`		`- iterator.remove();`
`79`		`- }`
`80`		`- }`
	`73`	`+ unavailableImageHandlers.removeIf(handler -> handler.apply(image));`
`81`	`74`	`}`
`82`	`75`	`}`