fix: removed annotations for local variable assignment

Signed-off-by: Matt Peterson <[email protected]>
hashgraph · Aug 22, 2024 · 121f52c · 121f52c
1 parent 5d366db
commit 121f52c
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 70 deletions.
diff --git a/server/src/main/java/com/hedera/block/server/BlockStreamService.java b/server/src/main/java/com/hedera/block/server/BlockStreamService.java
@@ -146,11 +146,10 @@ void protocSubscribeBlockStream(
                             subscribeStreamResponseObserver) {
         LOGGER.log(
                 System.Logger.Level.DEBUG,
-                "Executing Server Streaming subscribeBlockStream gRPC Service");
+                "Executing Server Streaming subscribeBlockStream gRPC method");
 
         // Return a custom StreamObserver to handle streaming blocks from the producer.
         if (serviceStatus.isRunning()) {
-            @NonNull
             final var streamObserver =
                     new ConsumerStreamResponseObserver(
                             blockNodeContext,
@@ -176,7 +175,6 @@ void protocSingleBlock(
         LOGGER.log(System.Logger.Level.DEBUG, "Executing Unary singleBlock gRPC method");
 
         try {
-            @NonNull
             final SingleBlockRequest pbjSingleBlockRequest =
                     toPbjSingleBlockRequest(singleBlockRequest);
             singleBlock(pbjSingleBlockRequest, singleBlockResponseStreamObserver);
@@ -200,7 +198,7 @@ private void singleBlock(
         if (serviceStatus.isRunning()) {
             final long blockNumber = singleBlockRequest.blockNumber();
             try {
-                @NonNull final Optional<Block> blockOpt = blockReader.read(blockNumber);
+                final Optional<Block> blockOpt = blockReader.read(blockNumber);
                 if (blockOpt.isPresent()) {
                     LOGGER.log(
                             System.Logger.Level.DEBUG,
@@ -209,7 +207,6 @@ private void singleBlock(
                     singleBlockResponseStreamObserver.onNext(
                             toProtocSingleBlockResponse(blockOpt.get()));
 
-                    @NonNull
                     final MetricsService metricsService = blockNodeContext.metricsService();
                     metricsService.singleBlocksRetrieved.increment();
                 } else {
@@ -238,7 +235,6 @@ private void singleBlock(
     @NonNull
     static com.hedera.hapi.block.protoc.SubscribeStreamResponse
             buildSubscribeStreamNotAvailableResponse() {
-        @NonNull
         final SubscribeStreamResponse response =
                 SubscribeStreamResponse.newBuilder()
                         .status(SubscribeStreamResponseCode.READ_STREAM_SUCCESS)
@@ -249,7 +245,6 @@ private void singleBlock(
 
     @NonNull
     static com.hedera.hapi.block.protoc.SingleBlockResponse buildSingleBlockNotAvailableResponse() {
-        @NonNull
         final SingleBlockResponse response =
                 SingleBlockResponse.newBuilder()
                         .status(SingleBlockResponseCode.READ_BLOCK_NOT_AVAILABLE)
@@ -261,7 +256,6 @@ static com.hedera.hapi.block.protoc.SingleBlockResponse buildSingleBlockNotAvail
     @NonNull
     static com.hedera.hapi.block.protoc.SingleBlockResponse buildSingleBlockNotFoundResponse()
             throws InvalidProtocolBufferException {
-        @NonNull
         final SingleBlockResponse response =
                 SingleBlockResponse.newBuilder()
                         .status(SingleBlockResponseCode.READ_BLOCK_NOT_FOUND)
@@ -275,8 +269,6 @@ private static com.hedera.hapi.block.SingleBlockRequest toPbjSingleBlockRequest(
             @NonNull final com.hedera.hapi.block.protoc.SingleBlockRequest singleBlockRequest)
             throws ParseException {
 
-        @NonNull final byte[] protocBytes = singleBlockRequest.toByteArray();
-        @NonNull final Bytes bytes = Bytes.wrap(protocBytes);
-        return SingleBlockRequest.PROTOBUF.parse(bytes);
+        return SingleBlockRequest.PROTOBUF.parse(Bytes.wrap(singleBlockRequest.toByteArray()));
     }
 }
diff --git a/server/src/main/java/com/hedera/block/server/Server.java b/server/src/main/java/com/hedera/block/server/Server.java
@@ -55,46 +55,39 @@ public static void main(final String[] args) {
 
         try {
             // init context, metrics, and configuration.
-            @NonNull final BlockNodeContext blockNodeContext = BlockNodeContextFactory.create();
+            final BlockNodeContext blockNodeContext = BlockNodeContextFactory.create();
+            final ServiceStatus serviceStatus = new ServiceStatusImpl();
 
-            @NonNull final ServiceStatus serviceStatus = new ServiceStatusImpl();
-
-            @NonNull
             final BlockWriter<BlockItem> blockWriter =
                     BlockAsDirWriterBuilder.newBuilder(blockNodeContext).build();
-            @NonNull
+
             final StreamMediator<BlockItem, ObjectEvent<SubscribeStreamResponse>> streamMediator =
                     LiveStreamMediatorBuilder.newBuilder(
                                     blockWriter, blockNodeContext, serviceStatus)
                             .build();
 
-            @NonNull
             final BlockReader<Block> blockReader =
                     BlockAsDirReaderBuilder.newBuilder(
                                     blockNodeContext
                                             .configuration()
                                             .getConfigData(PersistenceStorageConfig.class))
                             .build();
 
-            @NonNull
             final BlockStreamService blockStreamService =
                     buildBlockStreamService(
                             streamMediator, blockReader, serviceStatus, blockNodeContext);
 
-            @NonNull
             final GrpcRouting.Builder grpcRouting =
                     GrpcRouting.builder().service(blockStreamService);
 
-            @NonNull final HealthService healthService = new HealthServiceImpl(serviceStatus);
+            final HealthService healthService = new HealthServiceImpl(serviceStatus);
 
-            @NonNull
             final HttpRouting.Builder httpRouting =
                     HttpRouting.builder()
                             .register(healthService.getHealthRootPath(), healthService);
 
             // Build the web server
             // TODO: make port server a configurable value.
-            @NonNull
             final WebServer webServer =
                     WebServer.builder()
                             .port(8080)

diff --git a/server/src/main/java/com/hedera/block/server/Translator.java b/server/src/main/java/com/hedera/block/server/Translator.java
@@ -55,7 +55,6 @@ private Translator() {}
     public static com.hedera.hapi.block.protoc.SingleBlockResponse toProtocSingleBlockResponse(
             @NonNull final SingleBlockResponse singleBlockResponse) {
         try {
-            @NonNull
             final byte[] pbjBytes = asBytes(SingleBlockResponse.PROTOBUF, singleBlockResponse);
             return com.hedera.hapi.block.protoc.SingleBlockResponse.parseFrom(pbjBytes);
         } catch (InvalidProtocolBufferException e) {
@@ -77,7 +76,6 @@ public static com.hedera.hapi.block.protoc.SingleBlockResponse toProtocSingleBlo
     @NonNull
     public static com.hedera.hapi.block.protoc.SingleBlockResponse toProtocSingleBlockResponse(
             @NonNull final Block block) {
-        @NonNull
         final SingleBlockResponse singleBlockResponse =
                 SingleBlockResponse.newBuilder()
                         .status(SingleBlockResponseCode.READ_BLOCK_SUCCESS)
@@ -100,7 +98,6 @@ public static com.hedera.hapi.block.protoc.SingleBlockResponse toProtocSingleBlo
     public static com.hedera.hapi.block.protoc.PublishStreamResponse toProtocPublishStreamResponse(
             @NonNull final com.hedera.hapi.block.PublishStreamResponse publishStreamResponse) {
         try {
-            @NonNull
             final byte[] pbjBytes = asBytes(PublishStreamResponse.PROTOBUF, publishStreamResponse);
             return com.hedera.hapi.block.protoc.PublishStreamResponse.parseFrom(pbjBytes);
         } catch (InvalidProtocolBufferException e) {
@@ -125,7 +122,6 @@ public static com.hedera.hapi.block.protoc.PublishStreamResponse toProtocPublish
     public static com.hedera.hapi.block.protoc.PublishStreamRequest toProtocPublishStreamRequest(
             @NonNull final com.hedera.hapi.block.PublishStreamRequest publishStreamRequest) {
         try {
-            @NonNull
             final byte[] pbjBytes = asBytes(PublishStreamRequest.PROTOBUF, publishStreamRequest);
             return com.hedera.hapi.block.protoc.PublishStreamRequest.parseFrom(pbjBytes);
         } catch (InvalidProtocolBufferException e) {
@@ -153,7 +149,6 @@ public static com.hedera.hapi.block.protoc.PublishStreamRequest toProtocPublishS
                             final com.hedera.hapi.block.SubscribeStreamResponse
                                     subscribeStreamResponse) {
         try {
-            @NonNull
             final byte[] pbjBytes =
                     asBytes(SubscribeStreamResponse.PROTOBUF, subscribeStreamResponse);
             return com.hedera.hapi.block.protoc.SubscribeStreamResponse.parseFrom(pbjBytes);
@@ -183,7 +178,6 @@ public static com.hedera.hapi.block.protoc.PublishStreamRequest toProtocPublishS
                             final com.hedera.hapi.block.SubscribeStreamRequest
                                     subscribeStreamRequest) {
         try {
-            @NonNull
             final byte[] pbjBytes =
                     asBytes(SubscribeStreamRequest.PROTOBUF, subscribeStreamRequest);
             return com.hedera.hapi.block.protoc.SubscribeStreamRequest.parseFrom(pbjBytes);

diff --git a/server/src/main/java/com/hedera/block/server/consumer/ConsumerStreamResponseObserver.java b/server/src/main/java/com/hedera/block/server/consumer/ConsumerStreamResponseObserver.java
@@ -26,7 +26,6 @@
 import com.hedera.pbj.runtime.OneOf;
 import com.lmax.disruptor.EventHandler;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 import io.grpc.stub.ServerCallStreamObserver;
 import io.grpc.stub.StreamObserver;
 import java.time.InstantSource;
@@ -162,8 +161,7 @@ public void onEvent(
                 // Refresh the producer liveness and pass the BlockItem to the downstream observer.
                 producerLivenessMillis = currentMillis;
 
-                @NonNull final SubscribeStreamResponse subscribeStreamResponse = event.get();
-                @NonNull
+                final SubscribeStreamResponse subscribeStreamResponse = event.get();
                 final ResponseSender responseSender = getResponseSender(subscribeStreamResponse);
                 responseSender.send(subscribeStreamResponse);
             }
@@ -195,7 +193,7 @@ public void send(@NonNull final SubscribeStreamResponse subscribeStreamResponse)
 
             // Only start sending BlockItems after we've reached
             // the beginning of a block.
-            @Nullable final BlockItem blockItem = subscribeStreamResponse.blockItem();
+            final BlockItem blockItem = subscribeStreamResponse.blockItem();
             if (blockItem == null) {
                 LOGGER.log(
                         System.Logger.Level.ERROR,

diff --git a/server/src/main/java/com/hedera/block/server/mediator/LiveStreamMediatorImpl.java b/server/src/main/java/com/hedera/block/server/mediator/LiveStreamMediatorImpl.java
@@ -87,7 +87,6 @@ class LiveStreamMediatorImpl
         this.blockWriter = blockWriter;
 
         // Initialize and start the disruptor
-        @NonNull
         final Disruptor<ObjectEvent<SubscribeStreamResponse>> disruptor =
                 // TODO: replace ring buffer size with a configurable value, create a MediatorConfig
                 new Disruptor<>(ObjectEvent::new, 2048, DaemonThreadFactory.INSTANCE);
@@ -113,7 +112,6 @@ public void publish(@NonNull final BlockItem blockItem) throws IOException {
 
             // Publish the block for all subscribers to receive
             LOGGER.log(System.Logger.Level.DEBUG, "Publishing BlockItem: {0}", blockItem);
-            @NonNull
             final var subscribeStreamResponse =
                     SubscribeStreamResponse.newBuilder().blockItem(blockItem).build();
             ringBuffer.publishEvent((event, sequence) -> event.set(subscribeStreamResponse));
@@ -136,11 +134,11 @@ public void publish(@NonNull final BlockItem blockItem) throws IOException {
                 LOGGER.log(System.Logger.Level.DEBUG, "Send a response to end the stream");
 
                 // Publish the block for all subscribers to receive
-                @NonNull final SubscribeStreamResponse endStreamResponse = buildEndStreamResponse();
+                final SubscribeStreamResponse endStreamResponse = buildEndStreamResponse();
                 ringBuffer.publishEvent((event, sequence) -> event.set(endStreamResponse));
 
                 // Unsubscribe all downstream consumers
-                for (@NonNull final var subscriber : subscribers.keySet()) {
+                for (final var subscriber : subscribers.keySet()) {
                     LOGGER.log(System.Logger.Level.DEBUG, "Unsubscribing: {0}", subscriber);
                     unsubscribe(subscriber);
                 }
@@ -157,7 +155,6 @@ public void subscribe(
             @NonNull final EventHandler<ObjectEvent<SubscribeStreamResponse>> handler) {
 
         // Initialize the batch event processor and set it on the ring buffer
-        @NonNull
         final var batchEventProcessor =
                 new BatchEventProcessorBuilder()
                         .build(ringBuffer, ringBuffer.newBarrier(), handler);
@@ -176,7 +173,7 @@ public void unsubscribe(
             @NonNull final EventHandler<ObjectEvent<SubscribeStreamResponse>> handler) {
 
         // Remove the subscriber
-        @NonNull final var batchEventProcessor = subscribers.remove(handler);
+        final var batchEventProcessor = subscribers.remove(handler);
         if (batchEventProcessor == null) {
             LOGGER.log(System.Logger.Level.ERROR, "Subscriber not found: {0}", handler);
 

diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockAsDirReader.java b/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockAsDirReader.java
@@ -61,7 +61,7 @@ class BlockAsDirReader implements BlockReader<Block> {
 
         LOGGER.log(System.Logger.Level.INFO, "Initializing FileSystemBlockReader");
 
-        @NonNull final Path blockNodeRootPath = Path.of(config.rootPath());
+        final Path blockNodeRootPath = Path.of(config.rootPath());
 
         LOGGER.log(System.Logger.Level.INFO, config.toString());
         LOGGER.log(System.Logger.Level.INFO, "Block Node Root Path: " + blockNodeRootPath);
@@ -89,7 +89,7 @@ public Optional<Block> read(final long blockNumber) throws IOException {
 
         // Verify path attributes of the block directory within the
         // block node root path
-        @NonNull final Path blockPath = blockNodeRootPath.resolve(String.valueOf(blockNumber));
+        final Path blockPath = blockNodeRootPath.resolve(String.valueOf(blockNumber));
         if (isPathDisqualified(blockPath)) {
             return Optional.empty();
         }
@@ -105,11 +105,10 @@ public Optional<Block> read(final long blockNumber) throws IOException {
             // 10.blk), the loop will directly fetch the BlockItems in order based on
             // their file names. The loop will exit when it attempts to read a
             // BlockItem file that does not exist (e.g., 11.blk).
-            @NonNull final Block.Builder builder = Block.newBuilder();
-            @NonNull final List<BlockItem> blockItems = new ArrayList<>();
+            final Block.Builder builder = Block.newBuilder();
+            final List<BlockItem> blockItems = new ArrayList<>();
             for (int i = 1; ; i++) {
-                @NonNull final Path blockItemPath = blockPath.resolve(i + BLOCK_FILE_EXTENSION);
-                @NonNull
+                final Path blockItemPath = blockPath.resolve(i + BLOCK_FILE_EXTENSION);
                 final Optional<BlockItem> blockItemOpt = readBlockItem(blockItemPath.toString());
                 if (blockItemOpt.isPresent()) {
                     blockItems.add(blockItemOpt.get());
@@ -133,7 +132,7 @@ public Optional<Block> read(final long blockNumber) throws IOException {
     private Optional<BlockItem> readBlockItem(@NonNull final String blockItemPath)
             throws IOException {
 
-        try (@NonNull final FileInputStream fis = new FileInputStream(blockItemPath)) {
+        try (final FileInputStream fis = new FileInputStream(blockItemPath)) {
 
             BlockItem blockItem = BlockItem.PROTOBUF.parse(Bytes.wrap(fis.readAllBytes()));
             return Optional.of(blockItem);

diff --git a/...r/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockAsDirRemover.java b/...r/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockAsDirRemover.java
@@ -17,7 +17,6 @@
 package com.hedera.block.server.persistence.storage.remove;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -61,7 +60,7 @@ public void remove(final long id) throws IOException {
 
         // Calculate the block path and proactively set the permissions
         // for removal
-        @NonNull final Path blockPath = blockNodeRootPath.resolve(String.valueOf(id));
+        final Path blockPath = blockNodeRootPath.resolve(String.valueOf(id));
         if (Files.notExists(blockPath)) {
             LOGGER.log(System.Logger.Level.ERROR, "Block does not exist: {0}", id);
             return;
@@ -80,9 +79,9 @@ private static boolean delete(@NonNull final File file) {
         // Recursively delete the contents
         // of the directory
         if (file.isDirectory()) {
-            @Nullable final File[] files = file.listFiles();
+            final File[] files = file.listFiles();
             if (files != null) {
-                for (@NonNull final File f : files) {
+                for (final File f : files) {
                     delete(f);
                 }
             }

diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsDirWriter.java b/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsDirWriter.java
@@ -98,7 +98,7 @@ public void write(@NonNull final BlockItem blockItem) throws IOException {
             resetState(blockItem);
         }
 
-        @NonNull final Path blockItemFilePath = calculateBlockItemPath();
+        final Path blockItemFilePath = calculateBlockItemPath();
         for (int retries = 0; ; retries++) {
             try {
                 write(blockItemFilePath, blockItem);
@@ -137,8 +137,7 @@ public void write(@NonNull final BlockItem blockItem) throws IOException {
      */
     protected void write(@NonNull final Path blockItemFilePath, @NonNull final BlockItem blockItem)
             throws IOException {
-        try (@NonNull
-                final FileOutputStream fos = new FileOutputStream(blockItemFilePath.toString())) {
+        try (final FileOutputStream fos = new FileOutputStream(blockItemFilePath.toString())) {
 
             BlockItem.PROTOBUF.toBytes(blockItem).writeTo(fos);
             LOGGER.log(
@@ -170,7 +169,7 @@ private void resetState(@NonNull final BlockItem blockItem) throws IOException {
         blockNodeFileNameIndex = 0;
 
         // Increment the block counter
-        @NonNull final MetricsService metricsService = blockNodeContext.metricsService();
+        final MetricsService metricsService = blockNodeContext.metricsService();
         metricsService.blocksPersisted.increment();
     }
 
@@ -198,7 +197,7 @@ private void repairPermissions(@NonNull final Path path) throws IOException {
     @NonNull
     private Path calculateBlockItemPath() {
         // Build the path to a .blk file
-        @NonNull final Path blockPath = calculateBlockPath();
+        final Path blockPath = calculateBlockPath();
         blockNodeFileNameIndex++;
         return blockPath.resolve(blockNodeFileNameIndex + BLOCK_FILE_EXTENSION);
     }