Skip to content

Commit 55e376a

Browse files
OlegDokukaOlegDokuka
committed
renames all flyweights to codecs
Signed-off-by: Oleh Dokuka <[email protected]>
1 parent be382d7 commit 55e376a

File tree

112 files changed

+2403
-1941
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+2403
-1941
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import io.netty.buffer.ByteBuf;
2020
import io.netty.buffer.Unpooled;
2121
import io.rsocket.ConnectionSetupPayload;
22-
import io.rsocket.frame.FrameHeaderFlyweight;
23-
import io.rsocket.frame.SetupFrameFlyweight;
22+
import io.rsocket.frame.FrameHeaderCodec;
23+
import io.rsocket.frame.SetupFrameCodec;
2424

2525
/**
2626
* Default implementation of {@link ConnectionSetupPayload}. Primarily for internal use within
@@ -36,18 +36,18 @@ public DefaultConnectionSetupPayload(ByteBuf setupFrame) {
3636

3737
@Override
3838
public boolean hasMetadata() {
39-
return FrameHeaderFlyweight.hasMetadata(setupFrame);
39+
return FrameHeaderCodec.hasMetadata(setupFrame);
4040
}
4141

4242
@Override
4343
public ByteBuf sliceMetadata() {
44-
final ByteBuf metadata = SetupFrameFlyweight.metadata(setupFrame);
44+
final ByteBuf metadata = SetupFrameCodec.metadata(setupFrame);
4545
return metadata == null ? Unpooled.EMPTY_BUFFER : metadata;
4646
}
4747

4848
@Override
4949
public ByteBuf sliceData() {
50-
return SetupFrameFlyweight.data(setupFrame);
50+
return SetupFrameCodec.data(setupFrame);
5151
}
5252

5353
@Override
@@ -62,42 +62,42 @@ public ByteBuf metadata() {
6262

6363
@Override
6464
public String metadataMimeType() {
65-
return SetupFrameFlyweight.metadataMimeType(setupFrame);
65+
return SetupFrameCodec.metadataMimeType(setupFrame);
6666
}
6767

6868
@Override
6969
public String dataMimeType() {
70-
return SetupFrameFlyweight.dataMimeType(setupFrame);
70+
return SetupFrameCodec.dataMimeType(setupFrame);
7171
}
7272

7373
@Override
7474
public int keepAliveInterval() {
75-
return SetupFrameFlyweight.keepAliveInterval(setupFrame);
75+
return SetupFrameCodec.keepAliveInterval(setupFrame);
7676
}
7777

7878
@Override
7979
public int keepAliveMaxLifetime() {
80-
return SetupFrameFlyweight.keepAliveMaxLifetime(setupFrame);
80+
return SetupFrameCodec.keepAliveMaxLifetime(setupFrame);
8181
}
8282

8383
@Override
8484
public int getFlags() {
85-
return FrameHeaderFlyweight.flags(setupFrame);
85+
return FrameHeaderCodec.flags(setupFrame);
8686
}
8787

8888
@Override
8989
public boolean willClientHonorLease() {
90-
return SetupFrameFlyweight.honorLease(setupFrame);
90+
return SetupFrameCodec.honorLease(setupFrame);
9191
}
9292

9393
@Override
9494
public boolean isResumeEnabled() {
95-
return SetupFrameFlyweight.resumeEnabled(setupFrame);
95+
return SetupFrameCodec.resumeEnabled(setupFrame);
9696
}
9797

9898
@Override
9999
public ByteBuf resumeToken() {
100-
return SetupFrameFlyweight.resumeToken(setupFrame);
100+
return SetupFrameCodec.resumeToken(setupFrame);
101101
}
102102

103103
@Override

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.rsocket.core;
22

33
import io.rsocket.Payload;
4-
import io.rsocket.frame.FrameHeaderFlyweight;
5-
import io.rsocket.frame.FrameLengthFlyweight;
4+
import io.rsocket.frame.FrameHeaderCodec;
5+
import io.rsocket.frame.FrameLengthCodec;
66

77
final class PayloadValidationUtils {
88
static final String INVALID_PAYLOAD_ERROR_MESSAGE =
@@ -14,18 +14,18 @@ static boolean isValid(int mtu, Payload payload) {
1414
}
1515

1616
if (payload.hasMetadata()) {
17-
return (((FrameHeaderFlyweight.size()
18-
+ FrameLengthFlyweight.FRAME_LENGTH_SIZE
19-
+ FrameHeaderFlyweight.size()
17+
return (((FrameHeaderCodec.size()
18+
+ FrameLengthCodec.FRAME_LENGTH_SIZE
19+
+ FrameHeaderCodec.size()
2020
+ payload.data().readableBytes()
2121
+ payload.metadata().readableBytes())
22-
& ~FrameLengthFlyweight.FRAME_LENGTH_MASK)
22+
& ~FrameLengthCodec.FRAME_LENGTH_MASK)
2323
== 0);
2424
} else {
25-
return (((FrameHeaderFlyweight.size()
25+
return (((FrameHeaderCodec.size()
2626
+ payload.data().readableBytes()
27-
+ FrameLengthFlyweight.FRAME_LENGTH_SIZE)
28-
& ~FrameLengthFlyweight.FRAME_LENGTH_MASK)
27+
+ FrameLengthCodec.FRAME_LENGTH_SIZE)
28+
& ~FrameLengthCodec.FRAME_LENGTH_MASK)
2929
== 0);
3030
}
3131
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import io.rsocket.RSocket;
2424
import io.rsocket.SocketAcceptor;
2525
import io.rsocket.fragmentation.FragmentationDuplexConnection;
26-
import io.rsocket.frame.SetupFrameFlyweight;
26+
import io.rsocket.frame.SetupFrameCodec;
2727
import io.rsocket.frame.decoder.PayloadDecoder;
2828
import io.rsocket.internal.ClientServerInputMultiplexer;
2929
import io.rsocket.keepalive.KeepAliveHandler;
@@ -536,7 +536,7 @@ public Mono<RSocket> connect(Supplier<ClientTransport> transportSupplier) {
536536
RSocket wrappedRSocketRequester = interceptors.initRequester(rSocketRequester);
537537

538538
ByteBuf setupFrame =
539-
SetupFrameFlyweight.encode(
539+
SetupFrameCodec.encode(
540540
wrappedConnection.alloc(),
541541
leaseEnabled,
542542
(int) keepAliveInterval.toMillis(),

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

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@
3131
import io.rsocket.RSocket;
3232
import io.rsocket.exceptions.ConnectionErrorException;
3333
import io.rsocket.exceptions.Exceptions;
34-
import io.rsocket.frame.CancelFrameFlyweight;
35-
import io.rsocket.frame.ErrorFrameFlyweight;
36-
import io.rsocket.frame.FrameHeaderFlyweight;
34+
import io.rsocket.frame.CancelFrameCodec;
35+
import io.rsocket.frame.ErrorFrameCodec;
36+
import io.rsocket.frame.FrameHeaderCodec;
3737
import io.rsocket.frame.FrameType;
38-
import io.rsocket.frame.MetadataPushFrameFlyweight;
39-
import io.rsocket.frame.PayloadFrameFlyweight;
40-
import io.rsocket.frame.RequestChannelFrameFlyweight;
41-
import io.rsocket.frame.RequestFireAndForgetFrameFlyweight;
42-
import io.rsocket.frame.RequestNFrameFlyweight;
43-
import io.rsocket.frame.RequestResponseFrameFlyweight;
44-
import io.rsocket.frame.RequestStreamFrameFlyweight;
38+
import io.rsocket.frame.MetadataPushFrameCodec;
39+
import io.rsocket.frame.PayloadFrameCodec;
40+
import io.rsocket.frame.RequestChannelFrameCodec;
41+
import io.rsocket.frame.RequestFireAndForgetFrameCodec;
42+
import io.rsocket.frame.RequestNFrameCodec;
43+
import io.rsocket.frame.RequestResponseFrameCodec;
44+
import io.rsocket.frame.RequestStreamFrameCodec;
4545
import io.rsocket.frame.decoder.PayloadDecoder;
4646
import io.rsocket.internal.SynchronizedIntObjectHashMap;
4747
import io.rsocket.internal.UnboundedProcessor;
@@ -225,7 +225,7 @@ private Mono<Void> handleFireAndForget(Payload payload) {
225225

226226
final int streamId = streamIdSupplier.nextStreamId(receivers);
227227
final ByteBuf requestFrame =
228-
RequestFireAndForgetFrameFlyweight.encodeReleasingPayload(
228+
RequestFireAndForgetFrameCodec.encodeReleasingPayload(
229229
allocator, streamId, payload);
230230

231231
sendProcessor.onNext(requestFrame);
@@ -275,7 +275,7 @@ void hookOnFirstRequest(long n) {
275275
this.streamId = streamId;
276276

277277
ByteBuf requestResponseFrame =
278-
RequestResponseFrameFlyweight.encodeReleasingPayload(
278+
RequestResponseFrameCodec.encodeReleasingPayload(
279279
allocator, streamId, payload);
280280

281281
receivers.put(streamId, receiver);
@@ -285,8 +285,7 @@ void hookOnFirstRequest(long n) {
285285
@Override
286286
void hookOnCancel() {
287287
if (receivers.remove(streamId, receiver)) {
288-
sendProcessor.onNext(
289-
CancelFrameFlyweight.encode(allocator, streamId));
288+
sendProcessor.onNext(CancelFrameCodec.encode(allocator, streamId));
290289
} else {
291290
payload.release();
292291
}
@@ -341,7 +340,7 @@ void hookOnFirstRequest(long n) {
341340
this.streamId = streamId;
342341

343342
ByteBuf requestStreamFrame =
344-
RequestStreamFrameFlyweight.encodeReleasingPayload(
343+
RequestStreamFrameCodec.encodeReleasingPayload(
345344
allocator, streamId, n, payload);
346345

347346
receivers.put(streamId, receiver);
@@ -356,14 +355,13 @@ void hookOnRemainingRequests(long n) {
356355
}
357356

358357
sendProcessor.onNext(
359-
RequestNFrameFlyweight.encode(allocator, streamId, n));
358+
RequestNFrameCodec.encode(allocator, streamId, n));
360359
}
361360

362361
@Override
363362
void hookOnCancel() {
364363
if (receivers.remove(streamId, receiver)) {
365-
sendProcessor.onNext(
366-
CancelFrameFlyweight.encode(allocator, streamId));
364+
sendProcessor.onNext(CancelFrameCodec.encode(allocator, streamId));
367365
} else {
368366
payload.release();
369367
}
@@ -450,28 +448,26 @@ protected void hookOnNext(Payload payload) {
450448
new IllegalArgumentException(INVALID_PAYLOAD_ERROR_MESSAGE);
451449
errorConsumer.accept(t);
452450
// no need to send any errors.
453-
sendProcessor.onNext(
454-
CancelFrameFlyweight.encode(allocator, streamId));
451+
sendProcessor.onNext(CancelFrameCodec.encode(allocator, streamId));
455452
receiver.onError(t);
456453
return;
457454
}
458455
final ByteBuf frame =
459-
PayloadFrameFlyweight.encodeNextReleasingPayload(
456+
PayloadFrameCodec.encodeNextReleasingPayload(
460457
allocator, streamId, payload);
461458

462459
sendProcessor.onNext(frame);
463460
}
464461

465462
@Override
466463
protected void hookOnComplete() {
467-
ByteBuf frame =
468-
PayloadFrameFlyweight.encodeComplete(allocator, streamId);
464+
ByteBuf frame = PayloadFrameCodec.encodeComplete(allocator, streamId);
469465
sendProcessor.onNext(frame);
470466
}
471467

472468
@Override
473469
protected void hookOnError(Throwable t) {
474-
ByteBuf frame = ErrorFrameFlyweight.encode(allocator, streamId, t);
470+
ByteBuf frame = ErrorFrameCodec.encode(allocator, streamId, t);
475471
sendProcessor.onNext(frame);
476472
receiver.onError(t);
477473
}
@@ -488,7 +484,7 @@ void hookOnFirstRequest(long n) {
488484
this.streamId = streamId;
489485

490486
final ByteBuf frame =
491-
RequestChannelFrameFlyweight.encodeReleasingPayload(
487+
RequestChannelFrameCodec.encodeReleasingPayload(
492488
allocator, streamId, false, n, initialPayload);
493489

494490
senders.put(streamId, upstreamSubscriber);
@@ -508,14 +504,14 @@ void hookOnRemainingRequests(long n) {
508504
return;
509505
}
510506

511-
sendProcessor.onNext(RequestNFrameFlyweight.encode(allocator, streamId, n));
507+
sendProcessor.onNext(RequestNFrameCodec.encode(allocator, streamId, n));
512508
}
513509

514510
@Override
515511
void hookOnCancel() {
516512
senders.remove(streamId, upstreamSubscriber);
517513
if (receivers.remove(streamId, receiver)) {
518-
sendProcessor.onNext(CancelFrameFlyweight.encode(allocator, streamId));
514+
sendProcessor.onNext(CancelFrameCodec.encode(allocator, streamId));
519515
}
520516
}
521517

@@ -562,7 +558,7 @@ private Mono<Void> handleMetadataPush(Payload payload) {
562558
}
563559

564560
ByteBuf metadataPushFrame =
565-
MetadataPushFrameFlyweight.encodeReleasingPayload(allocator, payload);
561+
MetadataPushFrameCodec.encodeReleasingPayload(allocator, payload);
566562

567563
sendProcessor.onNextPrioritized(metadataPushFrame);
568564

@@ -585,8 +581,8 @@ private Throwable checkAvailable() {
585581

586582
private void handleIncomingFrames(ByteBuf frame) {
587583
try {
588-
int streamId = FrameHeaderFlyweight.streamId(frame);
589-
FrameType type = FrameHeaderFlyweight.frameType(frame);
584+
int streamId = FrameHeaderCodec.streamId(frame);
585+
FrameType type = FrameHeaderCodec.frameType(frame);
590586
if (streamId == 0) {
591587
handleStreamZero(type, frame);
592588
} else {
@@ -666,7 +662,7 @@ private void handleFrame(int streamId, FrameType type, ByteBuf frame) {
666662
{
667663
Subscription sender = senders.get(streamId);
668664
if (sender != null) {
669-
long n = RequestNFrameFlyweight.requestN(frame);
665+
long n = RequestNFrameCodec.requestN(frame);
670666
sender.request(n);
671667
}
672668
break;
@@ -682,7 +678,7 @@ private void handleMissingResponseProcessor(int streamId, FrameType type, ByteBu
682678
if (type == FrameType.ERROR) {
683679
// message for stream that has never existed, we have a problem with
684680
// the overall connection and must tear down
685-
String errorMessage = ErrorFrameFlyweight.dataUtf8(frame);
681+
String errorMessage = ErrorFrameCodec.dataUtf8(frame);
686682

687683
throw new IllegalStateException(
688684
"Client received error for non-existent stream: "

0 commit comments

Comments
 (0)