Skip to content

Commit 2950920

Browse files
fix: sanding
Signed-off-by: Matt Peterson <[email protected]>
1 parent 73b0ce0 commit 2950920

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

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

+5-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static com.hedera.block.protos.BlockStreamService.SubscribeStreamRequest;
2121
import static com.hedera.block.protos.BlockStreamService.SubscribeStreamResponse;
2222

23-
import com.google.protobuf.Descriptors;
2423
import com.hedera.block.protos.BlockStreamService;
2524
import com.hedera.block.server.data.ObjectEvent;
2625
import com.hedera.block.server.mediator.StreamMediator;
@@ -40,7 +39,8 @@ public class ConsumerBlockItemObserver
4039

4140
private final System.Logger LOGGER = System.getLogger(getClass().getName());
4241

43-
private final StreamObserver<BlockStreamService.SubscribeStreamResponse> subscribeStreamResponseObserver;
42+
private final StreamObserver<BlockStreamService.SubscribeStreamResponse>
43+
subscribeStreamResponseObserver;
4444

4545
private final long timeoutThresholdMillis;
4646
private final InstantSource producerLivenessClock;
@@ -93,8 +93,7 @@ public ConsumerBlockItemObserver(
9393

9494
/** Pass the block to the observer provided by Helidon */
9595
@Override
96-
public void onEvent(final ObjectEvent<BlockItem> event, final long l, final boolean b)
97-
throws Exception {
96+
public void onEvent(final ObjectEvent<BlockItem> event, final long l, final boolean b) {
9897

9998
// Refresh the producer liveness and pass the block to the observer.
10099
producerLivenessMillis = producerLivenessClock.millis();
@@ -105,10 +104,8 @@ public void onEvent(final ObjectEvent<BlockItem> event, final long l, final bool
105104
}
106105

107106
if (isReachedFirstBlock) {
108-
SubscribeStreamResponse subscribeStreamResponse = SubscribeStreamResponse
109-
.newBuilder()
110-
.setBlockItem(blockItem)
111-
.build();
107+
final SubscribeStreamResponse subscribeStreamResponse =
108+
SubscribeStreamResponse.newBuilder().setBlockItem(blockItem).build();
112109

113110
subscribeStreamResponseObserver.onNext(subscribeStreamResponse);
114111
}

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

+7-8
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,18 @@
1616

1717
package com.hedera.block.server.producer;
1818

19+
import static com.hedera.block.protos.BlockStreamService.*;
20+
1921
import com.google.protobuf.ByteString;
2022
import com.hedera.block.server.data.ObjectEvent;
2123
import com.hedera.block.server.mediator.StreamMediator;
2224
import io.grpc.stub.StreamObserver;
23-
2425
import java.io.ByteArrayOutputStream;
2526
import java.io.IOException;
2627
import java.io.ObjectOutputStream;
2728
import java.security.MessageDigest;
2829
import java.security.NoSuchAlgorithmException;
2930

30-
import static com.hedera.block.protos.BlockStreamService.*;
31-
3231
/**
3332
* The ProducerBlockStreamObserver class plugs into Helidon's server-initiated bidirectional gRPC
3433
* service implementation. Helidon calls methods on this class as networking events occur with the
@@ -72,9 +71,7 @@ public void onNext(final PublishStreamRequest publishStreamRequest) {
7271
.setItemAck(ByteString.copyFrom(getFakeHash(blockItem)))
7372
.build();
7473
final PublishStreamResponse publishStreamResponse =
75-
PublishStreamResponse.newBuilder()
76-
.setAcknowledgement(itemAck)
77-
.build();
74+
PublishStreamResponse.newBuilder().setAcknowledgement(itemAck).build();
7875
publishStreamResponseObserver.onNext(publishStreamResponse);
7976
} catch (IOException | NoSuchAlgorithmException e) {
8077
LOGGER.log(System.Logger.Level.ERROR, "Error calculating hash", e);
@@ -103,9 +100,11 @@ public void onCompleted() {
103100
publishStreamResponseObserver.onCompleted();
104101
}
105102

106-
private static byte[] getFakeHash(BlockItem blockItem) throws IOException, NoSuchAlgorithmException {
103+
private static byte[] getFakeHash(BlockItem blockItem)
104+
throws IOException, NoSuchAlgorithmException {
107105
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
108-
try (ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteArrayOutputStream)) {
106+
try (ObjectOutputStream objectOutputStream =
107+
new ObjectOutputStream(byteArrayOutputStream)) {
109108
objectOutputStream.writeObject(blockItem);
110109
}
111110

0 commit comments

Comments
 (0)