Skip to content

Commit 26f08f0

Browse files
stevegurystevegury
committed
Merge pull request #79 from DevFactory/release/general-code-quality-fix-1
General code quality fix-1
2 parents 06788a5 + 6b2fd73 commit 26f08f0

File tree

11 files changed

+28
-28
lines changed

11 files changed

+28
-28
lines changed

Diff for: ‎src/main/java/io/reactivesocket/ConnectionSetupPayload.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@ public int getFlags()
154154

155155
public boolean willClientHonorLease()
156156
{
157-
return (HONOR_LEASE == (getFlags() & HONOR_LEASE));
157+
return HONOR_LEASE == (getFlags() & HONOR_LEASE);
158158
}
159159

160160
public boolean doesClientRequestStrictInterpretation()
161161
{
162-
return (STRICT_INTERPRETATION == (getFlags() & STRICT_INTERPRETATION));
162+
return STRICT_INTERPRETATION == (getFlags() & STRICT_INTERPRETATION);
163163
}
164164
}

Diff for: ‎src/main/java/io/reactivesocket/Frame.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ public static Frame from(
343343
final Throwable throwable,
344344
ByteBuffer metadata
345345
) {
346-
String data = (throwable.getMessage() == null ? "" : throwable.getMessage());
346+
String data = throwable.getMessage() == null ? "" : throwable.getMessage();
347347
byte[] bytes = data.getBytes(Charset.forName("UTF-8"));
348348
final ByteBuffer dataBuffer = ByteBuffer.wrap(bytes);
349349

@@ -546,7 +546,7 @@ public static Frame from(ByteBuffer data, boolean respond)
546546
final Frame frame =
547547
POOL.acquireFrame(FrameHeaderFlyweight.computeFrameHeaderLength(FrameType.KEEPALIVE, 0, data.remaining()));
548548

549-
final int flags = (respond ? FrameHeaderFlyweight.FLAGS_KEEPALIVE_R : 0);
549+
final int flags = respond ? FrameHeaderFlyweight.FLAGS_KEEPALIVE_R : 0;
550550

551551
frame.length = FrameHeaderFlyweight.encode(
552552
frame.directBuffer, frame.offset, 0, flags, FrameType.KEEPALIVE, Frame.NULL_BYTEBUFFER, data);

Diff for: ‎src/main/java/io/reactivesocket/FrameType.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,22 @@ public int getEncodedType() {
9494

9595
public boolean isRequestType()
9696
{
97-
return (Flags.IS_REQUEST_TYPE == (flags & Flags.IS_REQUEST_TYPE));
97+
return Flags.IS_REQUEST_TYPE == (flags & Flags.IS_REQUEST_TYPE);
9898
}
9999

100100
public boolean hasInitialRequestN()
101101
{
102-
return (Flags.HAS_INITIAL_REQUEST_N == (flags & Flags.HAS_INITIAL_REQUEST_N));
102+
return Flags.HAS_INITIAL_REQUEST_N == (flags & Flags.HAS_INITIAL_REQUEST_N);
103103
}
104104

105105
public boolean canHaveData()
106106
{
107-
return (Flags.CAN_HAVE_DATA == (flags & Flags.CAN_HAVE_DATA));
107+
return Flags.CAN_HAVE_DATA == (flags & Flags.CAN_HAVE_DATA);
108108
}
109109

110110
public boolean canHaveMetadata()
111111
{
112-
return (Flags.CAN_HAVE_METADATA == (flags & Flags.CAN_HAVE_METADATA));
112+
return Flags.CAN_HAVE_METADATA == (flags & Flags.CAN_HAVE_METADATA);
113113
}
114114

115115
// TODO: offset of metadata and data (simplify parsing) naming: endOfFrameHeaderOffset()

Diff for: ‎src/main/java/io/reactivesocket/RequestHandler.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@
2323
public abstract class RequestHandler {
2424

2525
public static final Function<Payload, Publisher<Payload>> NO_REQUEST_RESPONSE_HANDLER =
26-
(payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestResponse' handler")));
26+
payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestResponse' handler"));
2727

2828
public static final Function<Payload, Publisher<Payload>> NO_REQUEST_STREAM_HANDLER =
29-
(payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestStream' handler")));
29+
payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestStream' handler"));
3030

3131
public static final Function<Payload, Publisher<Payload>> NO_REQUEST_SUBSCRIPTION_HANDLER =
32-
(payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestSubscription' handler")));
32+
payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestSubscription' handler"));
3333

3434
public static final Function<Payload, Publisher<Void>> NO_FIRE_AND_FORGET_HANDLER =
35-
(payload -> PublisherUtils.errorVoid(new RuntimeException("No 'fireAndForget' handler")));
35+
payload -> PublisherUtils.errorVoid(new RuntimeException("No 'fireAndForget' handler"));
3636

3737
public static final Function<Publisher<Payload>, Publisher<Payload>> NO_REQUEST_CHANNEL_HANDLER =
38-
(payloads) -> PublisherUtils.errorPayload(new RuntimeException("No 'requestChannel' handler"));
38+
payloads -> PublisherUtils.errorPayload(new RuntimeException("No 'requestChannel' handler"));
3939

4040
public static final Function<Payload, Publisher<Void>> NO_METADATA_PUSH_HANDLER =
41-
(payload -> PublisherUtils.errorVoid(new RuntimeException("No 'metadataPush' handler")));
41+
payload -> PublisherUtils.errorVoid(new RuntimeException("No 'metadataPush' handler"));
4242

4343
public abstract Publisher<Payload> handleRequestResponse(final Payload payload);
4444

Diff for: ‎src/main/java/io/reactivesocket/internal/PublisherUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ public void cancel()
211211
}
212212

213213
public static final Publisher<Frame> fromIterable(Iterable<Frame> is) {
214-
return new PublisherIterableSource<Frame>(is);
214+
return new PublisherIterableSource<>(is);
215215
}
216216

217217
public static final class PublisherIterableSource<T> extends AtomicBoolean implements Publisher<T> {

Diff for: ‎src/main/java/io/reactivesocket/internal/UnicastSubject.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public final class UnicastSubject<T> implements Subscriber<T>, Publisher<T> {
3737
private boolean subscribedTo = false;
3838

3939
public static <T> UnicastSubject<T> create() {
40-
return new UnicastSubject<T>(null, r -> {});
40+
return new UnicastSubject<>(null, r -> {});
4141
}
4242

4343
/**
@@ -46,15 +46,15 @@ public static <T> UnicastSubject<T> create() {
4646
* @return
4747
*/
4848
public static <T> UnicastSubject<T> create(BiConsumer<UnicastSubject<T>, Long> onConnect, Consumer<Long> onRequest) {
49-
return new UnicastSubject<T>(onConnect, onRequest);
49+
return new UnicastSubject<>(onConnect, onRequest);
5050
}
5151

5252
/**
5353
* @param onConnect Called when first requestN > 0 occurs.
5454
* @return
5555
*/
5656
public static <T> UnicastSubject<T> create(BiConsumer<UnicastSubject<T>, Long> onConnect) {
57-
return new UnicastSubject<T>(onConnect, r -> {});
57+
return new UnicastSubject<>(onConnect, r -> {});
5858
}
5959

6060
private UnicastSubject(BiConsumer<UnicastSubject<T>, Long> onConnect, Consumer<Long> onRequest) {

Diff for: ‎src/main/java/io/reactivesocket/internal/frame/FrameHeaderFlyweight.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ private static int metadataFieldLength(final DirectBuffer directBuffer, final in
269269

270270
if (FLAGS_M == (FLAGS_M & directBuffer.getShort(offset + FLAGS_FIELD_OFFSET, ByteOrder.BIG_ENDIAN)))
271271
{
272-
metadataLength = (directBuffer.getInt(metadataOffset(directBuffer, offset), ByteOrder.BIG_ENDIAN) & 0xFFFFFF);
272+
metadataLength = directBuffer.getInt(metadataOffset(directBuffer, offset), ByteOrder.BIG_ENDIAN) & 0xFFFFFF;
273273
}
274274

275275
return metadataLength;

Diff for: ‎src/main/java/io/reactivesocket/internal/frame/PayloadFragmenter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static boolean requiresFragmenting(final int metadataMtu, final int dataM
7474
final ByteBuffer metadata = payload.getMetadata();
7575
final ByteBuffer data = payload.getData();
7676

77-
return (metadata.remaining() > metadataMtu || data.remaining() > dataMtu);
77+
return metadata.remaining() > metadataMtu || data.remaining() > dataMtu;
7878
}
7979

8080
public Iterator<Frame> iterator()
@@ -84,7 +84,7 @@ public Iterator<Frame> iterator()
8484

8585
public boolean hasNext()
8686
{
87-
return (dataOffset < data.capacity() || metadataOffset < metadata.remaining());
87+
return dataOffset < data.capacity() || metadataOffset < metadata.remaining();
8888
}
8989

9090
public Frame next()
@@ -103,7 +103,7 @@ public Frame next()
103103
metadataOffset += metadataLength;
104104
dataOffset += dataLength;
105105

106-
final boolean isMoreFollowing = (metadataOffset < metadata.remaining() || dataOffset < data.remaining());
106+
final boolean isMoreFollowing = metadataOffset < metadata.remaining() || dataOffset < data.remaining();
107107
int flags = 0;
108108

109109
if (Type.RESPONSE == type)

Diff for: ‎src/perf/java/io/reactivesocket/perfutil/PerfUnicastSubjectNoBackpressure.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ public final class PerfUnicastSubjectNoBackpressure<T> implements Observable<T>,
3131
private boolean subscribedTo = false;
3232

3333
public static <T> PerfUnicastSubjectNoBackpressure<T> create() {
34-
return new PerfUnicastSubjectNoBackpressure<T>(null);
34+
return new PerfUnicastSubjectNoBackpressure<>(null);
3535
}
3636

3737
/**
3838
* @param onConnect Called when first requestN > 0 occurs.
3939
* @return
4040
*/
4141
public static <T> PerfUnicastSubjectNoBackpressure<T> create(Consumer<PerfUnicastSubjectNoBackpressure<T>> onConnect) {
42-
return new PerfUnicastSubjectNoBackpressure<T>(onConnect);
42+
return new PerfUnicastSubjectNoBackpressure<>(onConnect);
4343
}
4444

4545
private PerfUnicastSubjectNoBackpressure(Consumer<PerfUnicastSubjectNoBackpressure<T>> onConnect) {

Diff for: ‎src/test/java/io/reactivesocket/ReactiveSocketTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public class ReactiveSocketTest {
5656
private ReactiveSocket socketServer;
5757
private ReactiveSocket socketClient;
5858
private AtomicBoolean helloSubscriptionRunning = new AtomicBoolean(false);
59-
private AtomicReference<String> lastFireAndForget = new AtomicReference<String>();
60-
private AtomicReference<String> lastMetadataPush = new AtomicReference<String>();
61-
private AtomicReference<Throwable> lastServerError = new AtomicReference<Throwable>();
59+
private AtomicReference<String> lastFireAndForget = new AtomicReference<>();
60+
private AtomicReference<String> lastMetadataPush = new AtomicReference<>();
61+
private AtomicReference<Throwable> lastServerError = new AtomicReference<>();
6262
private CountDownLatch lastServerErrorCountDown;
6363
private CountDownLatch fireAndForgetOrMetadataPush;
6464

Diff for: ‎src/test/java/io/reactivesocket/TestTransportRequestN.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public void testRequestChannelUpstreamWithNFromTransport() throws InterruptedExc
165165
private ReactiveSocket socketServer;
166166
private ReactiveSocket socketClient;
167167
private AtomicBoolean helloSubscriptionRunning = new AtomicBoolean(false);
168-
private AtomicReference<Throwable> lastServerError = new AtomicReference<Throwable>();
168+
private AtomicReference<Throwable> lastServerError = new AtomicReference<>();
169169
private CountDownLatch lastServerErrorCountDown;
170170

171171
public void setup(TestConnectionWithControlledRequestN clientConnection, TestConnectionWithControlledRequestN serverConnection) throws InterruptedException {

0 commit comments

Comments
 (0)