Skip to content

Commit 2f51579

Browse files
fix: removing this prefixes when they are not needed
Signed-off-by: Matt Peterson <[email protected]>
1 parent d60a907 commit 2f51579

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

server/src/main/java/com/hedera/block/server/consumer/LiveStreamObserverImpl.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public class LiveStreamObserverImpl implements LiveStreamObserver<BlockStreamSer
4646
*
4747
*/
4848
public LiveStreamObserverImpl(final long timeoutThresholdMillis,
49-
StreamMediator<BlockStreamServiceGrpcProto.Block, BlockStreamServiceGrpcProto.BlockResponse> mediator,
50-
StreamObserver<BlockStreamServiceGrpcProto.Block> responseStreamObserver) {
49+
final StreamMediator<BlockStreamServiceGrpcProto.Block, BlockStreamServiceGrpcProto.BlockResponse> mediator,
50+
final StreamObserver<BlockStreamServiceGrpcProto.Block> responseStreamObserver) {
5151

5252
this.mediator = mediator;
5353
this.responseStreamObserver = responseStreamObserver;
@@ -65,14 +65,14 @@ public LiveStreamObserverImpl(final long timeoutThresholdMillis,
6565
@Override
6666
public void notify(final BlockStreamServiceGrpcProto.Block block) {
6767

68-
if (System.currentTimeMillis() - this.consumerLivenessMillis > timeoutThresholdMillis) {
68+
if (System.currentTimeMillis() - consumerLivenessMillis > timeoutThresholdMillis) {
6969
if (mediator.isSubscribed(this)) {
7070
LOGGER.log(System.Logger.Level.DEBUG, "Consumer timeout threshold exceeded. Unsubscribing observer.");
7171
mediator.unsubscribe(this);
7272
}
7373
} else {
74-
this.producerLivenessMillis = System.currentTimeMillis();
75-
this.responseStreamObserver.onNext(block);
74+
producerLivenessMillis = System.currentTimeMillis();
75+
responseStreamObserver.onNext(block);
7676
}
7777
}
7878

@@ -84,14 +84,14 @@ public void notify(final BlockStreamServiceGrpcProto.Block block) {
8484
@Override
8585
public void onNext(final BlockStreamServiceGrpcProto.BlockResponse blockResponse) {
8686

87-
if (System.currentTimeMillis() - this.producerLivenessMillis > timeoutThresholdMillis) {
87+
if (System.currentTimeMillis() - producerLivenessMillis > timeoutThresholdMillis) {
8888
if (mediator.isSubscribed(this)) {
8989
LOGGER.log(System.Logger.Level.DEBUG, "Producer timeout threshold exceeded. Unsubscribing observer.");
9090
mediator.unsubscribe(this);
9191
}
9292
} else {
9393
LOGGER.log(System.Logger.Level.DEBUG, "Received response block " + blockResponse);
94-
this.consumerLivenessMillis = System.currentTimeMillis();
94+
consumerLivenessMillis = System.currentTimeMillis();
9595
}
9696
}
9797

server/src/main/java/com/hedera/block/server/mediator/LiveStreamMediatorImpl.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
* LiveStreamMediatorImpl is the implementation of the StreamMediator interface. It is responsible for managing
3131
* the subscription and unsubscription operations of downstream consumers. It also proxies new blocks
3232
* to the subscribers as they arrive and persists the blocks to the block persistence store.
33-
*
3433
*/
3534
public class LiveStreamMediatorImpl implements StreamMediator<BlockStreamServiceGrpcProto.Block, BlockStreamServiceGrpcProto.BlockResponse> {
3635

@@ -56,7 +55,7 @@ public LiveStreamMediatorImpl(final BlockPersistenceHandler<BlockStreamServiceGr
5655
*/
5756
@Override
5857
public void subscribe(final LiveStreamObserver<BlockStreamServiceGrpcProto.Block, BlockStreamServiceGrpcProto.BlockResponse> liveStreamObserver) {
59-
this.subscribers.add(liveStreamObserver);
58+
subscribers.add(liveStreamObserver);
6059
}
6160

6261
/**
@@ -66,7 +65,7 @@ public void subscribe(final LiveStreamObserver<BlockStreamServiceGrpcProto.Block
6665
*/
6766
@Override
6867
public void unsubscribe(final LiveStreamObserver<BlockStreamServiceGrpcProto.Block, BlockStreamServiceGrpcProto.BlockResponse> liveStreamObserver) {
69-
if (this.subscribers.remove(liveStreamObserver)) {
68+
if (subscribers.remove(liveStreamObserver)) {
7069
LOGGER.log(System.Logger.Level.DEBUG, "Successfully removed observer from subscription list");
7170
} else {
7271
LOGGER.log(System.Logger.Level.ERROR, "Failed to remove observer from subscription list");
@@ -81,15 +80,15 @@ public void unsubscribe(final LiveStreamObserver<BlockStreamServiceGrpcProto.Blo
8180
*/
8281
@Override
8382
public boolean isSubscribed(final LiveStreamObserver<BlockStreamServiceGrpcProto.Block, BlockStreamServiceGrpcProto.BlockResponse> observer) {
84-
return this.subscribers.contains(observer);
83+
return subscribers.contains(observer);
8584
}
8685

8786
/**
8887
* Unsubscribe all observers from the mediator
8988
*/
9089
@Override
9190
public void unsubscribeAll() {
92-
this.subscribers.clear();
91+
subscribers.clear();
9392
}
9493

9594
/**

server/src/main/java/com/hedera/block/server/producer/ProducerBlockStreamObserver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void onNext(final BlockStreamServiceGrpcProto.Block block) {
6161
streamMediator.notifyAll(block);
6262

6363
final BlockStreamServiceGrpcProto.BlockResponse blockResponse = BlockStreamServiceGrpcProto.BlockResponse.newBuilder().setId(block.getId()).build();
64-
this.responseStreamObserver.onNext(blockResponse);
64+
responseStreamObserver.onNext(blockResponse);
6565
}
6666

6767
/**
@@ -82,7 +82,7 @@ public void onError(final Throwable t) {
8282
@Override
8383
public void onCompleted() {
8484
LOGGER.log(System.Logger.Level.DEBUG, "ProducerBlockStreamObserver completed");
85-
this.streamMediator.unsubscribeAll();
85+
streamMediator.unsubscribeAll();
8686
LOGGER.log(System.Logger.Level.DEBUG, "Unsubscribed all downstream consumers");
8787
}
8888
}

0 commit comments

Comments
 (0)