From c303fa0f19f2dc10406de9fd8d0d2c9562bf7e0d Mon Sep 17 00:00:00 2001
From: "Joseph S." <121976561+jsync-swirlds@users.noreply.github.com>
Date: Tue, 7 Jan 2025 07:44:42 -0700
Subject: [PATCH] chore: Switch license declarations to SPDX (#447)

Signed-off-by: Joseph Sinclair <121976561+jsync-swirlds@users.noreply.github.com>
---
 .github/release.yaml                          | 16 +----
 .github/workflows/e2e-tests.yaml              | 16 +----
 .github/workflows/helm-charts.yaml            | 16 +----
 .github/workflows/pr-checks.yaml              | 16 +----
 .github/workflows/pr-formatting.yaml          | 16 +----
 .github/workflows/release-automation.yaml     | 16 +----
 .github/workflows/release-push-image.yaml     | 16 +----
 .github/workflows/smoke-test.yaml             | 16 +----
 .../zxc-verify-docker-build-determinism.yaml  | 16 +----
 .../zxc-verify-gradle-build-determinism.yaml  | 16 +----
 build.gradle.kts                              | 17 +----
 buildSrc/build.gradle.kts                     | 17 +----
 buildSrc/src/main/kotlin/Utils.kt             | 17 +----
 ....hedera.block.aggregate-reports.gradle.kts | 17 +----
 .../kotlin/com.hedera.block.common.gradle.kts | 17 +----
 .../com.hedera.block.conventions.gradle.kts   | 17 +----
 .../com.hedera.block.jpms-modules.gradle.kts  | 17 +----
 .../com.hedera.block.maven-publish.gradle.kts | 17 +----
 .../com.hedera.block.protobuf.gradle.kts      | 17 +----
 .../kotlin/com.hedera.block.protos.gradle.kts | 10 +--
 .../com.hedera.block.repositories.gradle.kts  | 17 +----
 .../kotlin/com.hedera.block.root.gradle.kts   | 17 +----
 .../kotlin/com.hedera.block.server.gradle.kts | 18 +----
 .../com.hedera.block.simulator.gradle.kts     | 17 +----
 ...dera.block.spotless-conventions.gradle.kts | 33 +--------
 ...block.spotless-java-conventions.gradle.kts | 37 +---------
 ...ock.spotless-kotlin-conventions.gradle.kts | 33 +--------
 .../kotlin/com.hedera.block.suites.gradle.kts | 17 +----
 .../kotlin/com.hedera.block.tools.gradle.kts  | 17 +----
 .../kotlin/com/hedera/block/tasks/GitClone.kt | 17 +----
 common/build.gradle.kts                       | 17 +----
 .../common/constants/StringsConstants.java    | 17 +----
 .../hedera/block/common/utils/ChunkUtils.java | 20 +-----
 .../block/common/utils/FileUtilities.java     | 17 +----
 .../block/common/utils/MathUtilities.java     | 17 +----
 .../block/common/utils/Preconditions.java     | 17 +----
 .../block/common/utils/StringUtilities.java   | 17 +----
 .../block/common/CommonsTestUtility.java      | 17 +----
 .../block/common/utils/ChunkUtilsTest.java    | 23 +-----
 .../block/common/utils/FileUtilitiesTest.java | 17 +----
 .../block/common/utils/MathUtilitiesTest.java | 17 +----
 .../block/common/utils/PreconditionsTest.java | 17 +----
 .../common/utils/StringUtilitiesTest.java     | 17 +----
 server/build.gradle.kts                       | 17 +----
 .../com/hedera/block/server/BlockNodeApp.java | 17 +----
 .../BlockNodeAppInjectionComponent.java       | 17 +----
 .../server/BlockNodeAppInjectionModule.java   | 20 +-----
 .../com/hedera/block/server/Constants.java    | 17 +----
 .../java/com/hedera/block/server/Server.java  | 17 +----
 .../com/hedera/block/server/ServerConfig.java | 17 +----
 .../config/BlockNodeConfigExtension.java      | 17 +----
 .../block/server/config/BlockNodeContext.java | 20 +-----
 .../server/config/ConfigInjectionModule.java  | 17 +----
 .../ServerMappedConfigSourceInitializer.java  | 17 +----
 .../block/server/consumer/ConsumerConfig.java | 20 +-----
 .../ConsumerStreamResponseObserver.java       | 17 +----
 .../server/events/BlockNodeEventHandler.java  | 17 +----
 .../server/events/LivenessCalculator.java     | 20 +-----
 .../block/server/events/ObjectEvent.java      | 17 +----
 .../BlockStreamProtocolException.java         | 17 +----
 .../server/health/HealthInjectionModule.java  | 17 +----
 .../block/server/health/HealthService.java    | 17 +----
 .../server/health/HealthServiceImpl.java      | 23 +-----
 .../server/mediator/LiveStreamMediator.java   | 17 +----
 .../mediator/LiveStreamMediatorBuilder.java   | 17 +----
 .../mediator/LiveStreamMediatorImpl.java      | 17 +----
 .../block/server/mediator/MediatorConfig.java | 17 +----
 .../mediator/MediatorInjectionModule.java     | 17 +----
 .../mediator/NoOpLiveStreamMediator.java      | 17 +----
 .../block/server/mediator/Publisher.java      | 17 +----
 .../block/server/mediator/StreamMediator.java | 17 +----
 .../server/mediator/SubscriptionHandler.java  | 17 +----
 .../mediator/SubscriptionHandlerBase.java     | 17 +----
 .../server/metrics/BlockNodeMetricTypes.java  | 17 +----
 .../metrics/MetricsInjectionModule.java       | 17 +----
 .../block/server/metrics/MetricsService.java  | 17 +----
 .../server/metrics/MetricsServiceImpl.java    | 17 +----
 .../block/server/notifier/Notifiable.java     | 17 +----
 .../block/server/notifier/Notifier.java       | 17 +----
 .../block/server/notifier/NotifierConfig.java | 17 +----
 .../block/server/notifier/NotifierImpl.java   | 17 +----
 .../notifier/NotifierInjectionModule.java     | 17 +----
 .../server/pbj/PbjBlockAccessService.java     | 17 +----
 .../pbj/PbjBlockAccessServiceProxy.java       | 17 +----
 .../server/pbj/PbjBlockStreamService.java     | 17 +----
 .../pbj/PbjBlockStreamServiceProxy.java       | 17 +----
 .../block/server/pbj/PbjInjectionModule.java  | 17 +----
 .../PersistenceInjectionModule.java           | 17 +----
 .../StreamPersistenceHandlerImpl.java         | 17 +----
 .../storage/PersistenceStorageConfig.java     | 17 +----
 .../storage/compression/Compression.java      | 17 +----
 .../storage/compression/NoOpCompression.java  | 17 +----
 .../storage/compression/ZstdCompression.java  | 17 +----
 .../path/BlockAsLocalDirPathResolver.java     | 17 +----
 .../path/BlockAsLocalFilePathResolver.java    | 17 +----
 .../storage/path/BlockPathResolver.java       | 17 +----
 .../storage/path/NoOpBlockPathResolver.java   | 17 +----
 .../storage/read/BlockAsLocalDirReader.java   | 17 +----
 .../storage/read/BlockAsLocalFileReader.java  | 17 +----
 .../persistence/storage/read/BlockReader.java | 17 +----
 .../storage/read/LocalBlockReader.java        | 17 +----
 .../storage/read/NoOpBlockReader.java         | 17 +----
 .../remove/BlockAsLocalDirRemover.java        | 17 +----
 .../remove/BlockAsLocalFileRemover.java       | 17 +----
 .../storage/remove/BlockRemover.java          | 17 +----
 .../storage/remove/LocalBlockRemover.java     | 17 +----
 .../storage/remove/NoOpBlockRemover.java      | 17 +----
 .../storage/write/BlockAsLocalDirWriter.java  | 17 +----
 .../storage/write/BlockAsLocalFileWriter.java | 17 +----
 .../storage/write/BlockWriter.java            | 17 +----
 .../storage/write/LocalBlockWriter.java       | 17 +----
 .../storage/write/NoOpBlockWriter.java        | 17 +----
 .../server/producer/NoOpProducerObserver.java | 17 +----
 .../producer/ProducerBlockItemObserver.java   | 17 +----
 .../block/server/producer/ProducerConfig.java | 17 +----
 .../hedera/block/server/producer/Util.java    | 17 +----
 .../block/server/service/ServiceConfig.java   | 21 +-----
 .../service/ServiceInjectionModule.java       | 17 +----
 .../block/server/service/ServiceStatus.java   | 17 +----
 .../server/service/ServiceStatusImpl.java     | 23 ++----
 .../BlockNodeAppInjectionModuleTest.java      | 35 +++------
 .../hedera/block/server/BlockNodeAppTest.java | 17 +----
 .../hedera/block/server/ServerConfigTest.java | 17 +----
 .../server/config/BlockNodeContextTest.java   | 17 +----
 .../config/ConfigInjectionModuleTest.java     | 17 +----
 ...rverMappedConfigSourceInitializerTest.java | 17 +----
 .../server/config/TestConfigBuilder.java      | 23 +-----
 .../server/consumer/ConsumerConfigTest.java   | 20 +-----
 .../ConsumerStreamResponseObserverTest.java   | 17 +----
 .../server/grpc/BlockAccessServiceTest.java   | 17 +----
 .../server/health/HealthServiceTest.java      | 26 ++-----
 .../mediator/LiveStreamMediatorImplTest.java  | 17 +----
 .../server/mediator/MediatorConfigTest.java   | 17 +----
 .../mediator/MediatorInjectionModuleTest.java | 17 +----
 .../metrics/MetricsInjectionModuleTest.java   | 17 +----
 .../server/metrics/MetricsServiceTest.java    | 28 +++-----
 .../server/notifier/NotifierConfigTest.java   | 17 +----
 .../server/notifier/NotifierImplTest.java     | 17 +----
 .../pbj/PbjBlockAccessServiceProxyTest.java   | 17 +----
 .../PbjBlockStreamServiceIntegrationTest.java | 17 +----
 .../PersistenceInjectionModuleTest.java       | 17 +----
 .../StreamPersistenceHandlerImplTest.java     | 17 +----
 .../storage/PersistenceStorageConfigTest.java | 17 +----
 .../compression/NoOpCompressionTest.java      | 17 +----
 .../compression/ZstdCompressionTest.java      | 17 +----
 .../path/BlockAsLocalDirPathResolverTest.java | 17 +----
 .../BlockAsLocalFilePathResolverTest.java     | 17 +----
 .../path/NoOpBlockPathResolverTest.java       | 17 +----
 .../read/BlockAsLocalDirReaderTest.java       | 17 +----
 .../read/BlockAsLocalFileReaderTest.java      | 17 +----
 .../storage/read/NoOpBlockReaderTest.java     | 17 +----
 .../remove/BlockAsLocalDirRemoverTest.java    | 17 +----
 .../remove/BlockAsLocalFileRemoverTest.java   | 17 +----
 .../storage/remove/NoOpBlockRemoverTest.java  | 17 +----
 .../write/BlockAsLocalDirWriterTest.java      | 17 +----
 .../write/BlockAsLocalFileWriterTest.java     | 17 +----
 .../storage/write/NoOpBlockWriterTest.java    | 17 +----
 .../ProducerBlockItemObserverTest.java        | 17 +----
 .../server/service/ServiceConfigTest.java     | 20 +-----
 .../block/server/util/PbjProtoTestUtils.java  | 17 +----
 .../block/server/util/PersistTestUtils.java   | 17 +----
 .../block/server/util/TestConfigUtil.java     | 17 +----
 .../hedera/block/server/util/TestUtils.java   | 17 +----
 settings.gradle.kts                           | 17 +----
 simulator/build.gradle.kts                    | 17 +----
 .../block/simulator/BlockStreamSimulator.java | 17 +----
 .../simulator/BlockStreamSimulatorApp.java    | 17 +----
 ...lockStreamSimulatorInjectionComponent.java | 17 +----
 .../com/hedera/block/simulator/Constants.java | 17 +----
 .../config/ConfigInjectionModule.java         | 17 +----
 .../config/SimulatorConfigExtension.java      | 17 +----
 ...imulatorMappedConfigSourceInitializer.java | 17 +----
 .../config/data/BlockGeneratorConfig.java     | 17 +----
 .../config/data/BlockStreamConfig.java        | 17 +----
 .../simulator/config/data/GrpcConfig.java     | 17 +----
 .../simulator/config/data/StreamStatus.java   | 17 +----
 .../config/types/GenerationMode.java          | 17 +----
 .../simulator/config/types/SimulatorMode.java | 17 +----
 .../simulator/config/types/StreamingMode.java | 17 +----
 .../BlockSimulatorParsingException.java       | 17 +----
 .../BlockAsDirBlockStreamManager.java         | 17 +----
 .../BlockAsFileBlockStreamManager.java        | 17 +----
 .../generator/BlockAsFileLargeDataSets.java   | 17 +----
 .../generator/BlockStreamManager.java         | 17 +----
 .../generator/GeneratorInjectionModule.java   | 17 +----
 .../grpc/ConsumerStreamGrpcClient.java        | 17 +----
 .../simulator/grpc/GrpcInjectionModule.java   | 17 +----
 .../grpc/PublishStreamGrpcClient.java         | 17 +----
 .../impl/ConsumerStreamGrpcClientImpl.java    | 17 +----
 .../grpc/impl/ConsumerStreamObserver.java     | 17 +----
 .../impl/PublishStreamGrpcClientImpl.java     | 17 +----
 .../grpc/impl/PublishStreamObserver.java      | 17 +----
 .../metrics/MetricsInjectionModule.java       | 17 +----
 .../simulator/metrics/MetricsService.java     | 17 +----
 .../simulator/metrics/MetricsServiceImpl.java | 17 +----
 .../metrics/SimulatorMetricTypes.java         | 17 +----
 .../simulator/mode/CombinedModeHandler.java   | 17 +----
 .../simulator/mode/ConsumerModeHandler.java   | 17 +----
 .../simulator/mode/PublisherModeHandler.java  | 17 +----
 .../simulator/mode/SimulatorModeHandler.java  | 17 +----
 .../simulator/BlockStreamSimulatorTest.java   | 17 +----
 .../com/hedera/block/simulator/TestUtils.java | 17 +----
 .../config/ConfigInjectionModuleTest.java     | 17 +----
 ...atorMappedConfigSourceInitializerTest.java | 17 +----
 .../simulator/config/TestConfigBuilder.java   | 23 +-----
 .../config/data/BlockStreamConfigTest.java    | 17 +----
 .../config/data/StreamStatusTest.java         | 17 +----
 .../config/types/GenerationModeTest.java      | 17 +----
 .../config/types/StreamingModeTest.java       | 17 +----
 .../BlockAsDirBlockStreamManagerTest.java     | 17 +----
 .../BlockAsFileBlockStreamManagerTest.java    | 17 +----
 .../BlockAsFileLargeDataSetsTest.java         | 17 +----
 .../GeneratorInjectionModuleTest.java         | 71 +++++--------------
 .../ConsumerStreamGrpcClientImplTest.java     | 17 +----
 .../grpc/impl/ConsumerStreamObserverTest.java | 17 +----
 .../impl/PublishStreamGrpcClientImplTest.java | 17 +----
 .../grpc/impl/PublishStreamObserverTest.java  | 17 +----
 .../metrics/MetricsInjectionModuleTest.java   | 17 +----
 .../simulator/metrics/MetricsServiceTest.java | 17 +----
 .../mode/CombinedModeHandlerTest.java         | 17 +----
 .../mode/ConsumerModeHandlerTest.java         | 17 +----
 .../mode/PublisherModeHandlerTest.java        | 17 +----
 stream/build.gradle.kts                       | 17 +----
 suites/build.gradle.kts                       | 17 +----
 .../com/hedera/block/suites/BaseSuite.java    | 17 +----
 .../block/suites/ErrorLoggingExecutor.java    | 17 +----
 .../block/suites/grpc/GrpcTestSuites.java     | 17 +----
 .../NegativeServerAvailabilityTests.java      | 17 +----
 .../PositiveEndpointBehaviourTests.java       | 17 +----
 .../PositiveServerAvailabilityTests.java      | 17 +----
 .../DataPersistenceTestSuites.java            | 17 +----
 .../PositiveDataPersistenceTests.java         | 17 +----
 tool.sh                                       |  1 +
 tools/build.gradle.kts                        | 33 +--------
 .../hedera/block/tools/BlockStreamTool.java   | 17 +----
 .../block/tools/commands/BlockInfo.java       | 17 +----
 .../block/tools/commands/ConvertToJson.java   | 17 +----
 .../record2blocks/Record2BlockCommand.java    | 17 +----
 .../record2blocks/gcp/AddNewerBlockTimes.java | 17 +----
 .../record2blocks/gcp/MainNetBucket.java      | 17 +----
 .../mirrornode/ExtractBlockTimes.java         | 17 +----
 .../mirrornode/FetchBlockQuery.java           | 17 +----
 .../mirrornode/FetchMirrorNodeRecordsCsv.java | 17 +----
 .../mirrornode/ValidateBlockTimes.java        | 17 +----
 .../record2blocks/model/BlockInfo.java        | 17 +----
 .../record2blocks/model/BlockTimes.java       | 17 +----
 .../record2blocks/model/ChainFile.java        | 17 +----
 .../model/ChainFileAndCount.java              | 17 +----
 .../model/NumberedSidecarFile.java            | 17 +----
 .../model/ParsedSignatureFile.java            | 17 +----
 .../record2blocks/model/RecordFileInfo.java   | 17 +----
 .../record2blocks/util/BlockWriter.java       | 17 +----
 .../record2blocks/util/RecordFileDates.java   | 17 +----
 253 files changed, 318 insertions(+), 4166 deletions(-)

diff --git a/.github/release.yaml b/.github/release.yaml
index 974911be4..472dd91bd 100644
--- a/.github/release.yaml
+++ b/.github/release.yaml
@@ -1,18 +1,4 @@
-##
-# Copyright (C) 2024 Hedera Hashgraph, LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
+# SPDX-License-Identifier: Apache-2.0
 changelog:
   exclude:
     labels: ['wontfix', 'question', 'duplicate', 'invalid']
diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index 5c61a5801..2a45c909f 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -1,18 +1,4 @@
-##
-# Copyright (C) 2024 Hedera Hashgraph, LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
+# SPDX-License-Identifier: Apache-2.0
 name: "E2E Test Suites"
 on:
   push:
diff --git a/.github/workflows/helm-charts.yaml b/.github/workflows/helm-charts.yaml
index 9812545fb..92085dc0c 100644
--- a/.github/workflows/helm-charts.yaml
+++ b/.github/workflows/helm-charts.yaml
@@ -1,18 +1,4 @@
-##
-# Copyright (C) 2024 Hedera Hashgraph, LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
+# SPDX-License-Identifier: Apache-2.0
 name: Lint and Test Charts
 
 on: pull_request
diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml
index 04a767b98..656128898 100644
--- a/.github/workflows/pr-checks.yaml
+++ b/.github/workflows/pr-checks.yaml
@@ -1,18 +1,4 @@
-##
-# Copyright (C) 2024 Hedera Hashgraph, LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
+# SPDX-License-Identifier: Apache-2.0
 name: "PR Gradle Checks"
 on:
   push:
diff --git a/.github/workflows/pr-formatting.yaml b/.github/workflows/pr-formatting.yaml
index e647eb4c4..c669d308c 100644
--- a/.github/workflows/pr-formatting.yaml
+++ b/.github/workflows/pr-formatting.yaml
@@ -1,18 +1,4 @@
-##
-# Copyright (C) 2023-2024 Hedera Hashgraph, LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
+# SPDX-License-Identifier: Apache-2.0
 name: "PR Formatting Checks"
 on:
   pull_request:
diff --git a/.github/workflows/release-automation.yaml b/.github/workflows/release-automation.yaml
index bef04163a..14bdef7e3 100644
--- a/.github/workflows/release-automation.yaml
+++ b/.github/workflows/release-automation.yaml
@@ -1,18 +1,4 @@
-##
-# Copyright (C) 2024 Hedera Hashgraph, LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
+# SPDX-License-Identifier: Apache-2.0
 name: Release Automation
 
 on:
diff --git a/.github/workflows/release-push-image.yaml b/.github/workflows/release-push-image.yaml
index be5bb27d8..bcba2e6b5 100644
--- a/.github/workflows/release-push-image.yaml
+++ b/.github/workflows/release-push-image.yaml
@@ -1,18 +1,4 @@
-##
-# Copyright (C) 2024 Hedera Hashgraph, LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
+# SPDX-License-Identifier: Apache-2.0
 name: Release Workflow
 
 on:
diff --git a/.github/workflows/smoke-test.yaml b/.github/workflows/smoke-test.yaml
index 2de3ba4ca..4bc46a5ce 100644
--- a/.github/workflows/smoke-test.yaml
+++ b/.github/workflows/smoke-test.yaml
@@ -1,18 +1,4 @@
-##
-# Copyright (C) 2024 Hedera Hashgraph, LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
+# SPDX-License-Identifier: Apache-2.0
 name: "Smoke Test"
 on:
   push:
diff --git a/.github/workflows/zxc-verify-docker-build-determinism.yaml b/.github/workflows/zxc-verify-docker-build-determinism.yaml
index 79f4c239f..7131aa7da 100644
--- a/.github/workflows/zxc-verify-docker-build-determinism.yaml
+++ b/.github/workflows/zxc-verify-docker-build-determinism.yaml
@@ -1,18 +1,4 @@
-##
-# Copyright (C) 2023-2024 Hedera Hashgraph, LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
+# SPDX-License-Identifier: Apache-2.0
 name: "ZXC: Verify Docker Build Determinism"
 on:
   workflow_call:
diff --git a/.github/workflows/zxc-verify-gradle-build-determinism.yaml b/.github/workflows/zxc-verify-gradle-build-determinism.yaml
index d8d1fb3bd..4cc5d9224 100644
--- a/.github/workflows/zxc-verify-gradle-build-determinism.yaml
+++ b/.github/workflows/zxc-verify-gradle-build-determinism.yaml
@@ -1,18 +1,4 @@
-##
-# Copyright (C) 2023-2024 Hedera Hashgraph, LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
+# SPDX-License-Identifier: Apache-2.0
 name: "ZXC: Verify Gradle Build Determinism"
 # Here, the ZXC prefix:
 # Z - Ensures sort order such that this script appears at the bottom of the UI
diff --git a/build.gradle.kts b/build.gradle.kts
index 3bd71c4cd..b8887d602 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("com.hedera.block.root")
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index d9fff832f..8660955e9 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { `kotlin-dsl` }
 
 repositories { gradlePluginPortal() }
diff --git a/buildSrc/src/main/kotlin/Utils.kt b/buildSrc/src/main/kotlin/Utils.kt
index f6ce8f4bf..bc86e78ab 100644
--- a/buildSrc/src/main/kotlin/Utils.kt
+++ b/buildSrc/src/main/kotlin/Utils.kt
@@ -1,25 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
 import net.swiftzer.semver.SemVer
 import org.gradle.api.Project
 import java.io.File
 import java.io.OutputStream
 import java.io.PrintStream
 
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 class Utils {
     companion object {
         @JvmStatic
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.aggregate-reports.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.aggregate-reports.gradle.kts
index 0a3a6a386..aa723c1a1 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.aggregate-reports.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.aggregate-reports.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import java.io.BufferedOutputStream
 import net.swiftzer.semver.SemVer
 
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.common.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.common.gradle.kts
index 5fdfbba27..7fe25c44c 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.common.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.common.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("java-library")
     id("com.hedera.block.conventions")
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.conventions.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.conventions.gradle.kts
index 9b053e332..0545f133c 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.conventions.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import com.adarshr.gradle.testlogger.theme.ThemeType
 
 plugins {
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.jpms-modules.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.jpms-modules.gradle.kts
index fe391c123..6e821b115 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.jpms-modules.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.jpms-modules.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2016-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("org.gradlex.jvm-dependency-conflict-resolution")
     id("org.gradlex.extra-java-module-info")
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.maven-publish.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.maven-publish.gradle.kts
index 4e6aaabfd..d06dbe8ec 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.maven-publish.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.maven-publish.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("java")
     id("maven-publish")
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.protobuf.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.protobuf.gradle.kts
index 359e50c5c..8a0c5fcc9 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.protobuf.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.protobuf.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import com.google.protobuf.gradle.id
 import com.hedera.block.tasks.GitClone
 
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.protos.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.protos.gradle.kts
index 291f89918..aa4d16327 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.protos.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.protos.gradle.kts
@@ -1,16 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("java")
     id("com.google.protobuf")
     id("com.hedera.block.conventions")
 }
 
-sourceSets {
-    main {
-        proto {
-            srcDir("src/main/protobuf")
-        }
-    }
-}
+sourceSets { main { proto { srcDir("src/main/protobuf") } } }
 
 protobuf {
     // Configure the protoc executable
@@ -19,4 +14,3 @@ protobuf {
         artifact = "com.google.protobuf:protoc:3.21.10"
     }
 }
-
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.repositories.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.repositories.gradle.kts
index 6db244ccd..d10183379 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.repositories.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.repositories.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 repositories {
     mavenCentral()
     maven {
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.root.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.root.gradle.kts
index fbfa2c467..18a75045e 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.root.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.root.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import io.github.gradlenexus.publishplugin.CloseNexusStagingRepository
 
 plugins {
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.server.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.server.gradle.kts
index 5bb202c3b..88e93fc07 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.server.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.server.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("application")
     id("com.hedera.block.conventions")
@@ -23,4 +8,3 @@ plugins {
 val maven = publishing.publications.create<MavenPublication>("maven") { from(components["java"]) }
 
 signing.sign(maven)
-
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.simulator.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.simulator.gradle.kts
index f5361b330..88e93fc07 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.simulator.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.simulator.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("application")
     id("com.hedera.block.conventions")
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.spotless-conventions.gradle.kts
index f83772726..29546c7bf 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.spotless-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.spotless-conventions.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("com.diffplug.spotless") }
 
 spotless {
@@ -42,21 +27,7 @@ spotless {
 
         licenseHeader(
             """
-            ##
-            # Copyright (C) ${'$'}YEAR Hedera Hashgraph, LLC
-            #
-            # Licensed under the Apache License, Version 2.0 (the "License");
-            # you may not use this file except in compliance with the License.
-            # You may obtain a copy of the License at
-            #
-            #      http://www.apache.org/licenses/LICENSE-2.0
-            #
-            # Unless required by applicable law or agreed to in writing, software
-            # distributed under the License is distributed on an "AS IS" BASIS,
-            # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-            # See the License for the specific language governing permissions and
-            # limitations under the License.
-            ##
+            # SPDX-License-Identifier: Apache-2.0
         """
                 .trimIndent(),
             "(name|on)"
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.spotless-java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.spotless-java-conventions.gradle.kts
index 89ce27de3..62a8f6ddb 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.spotless-java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.spotless-java-conventions.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("com.diffplug.spotless") }
 
 spotless {
@@ -31,28 +16,12 @@ spotless {
         indentWithSpaces(4)
         trimTrailingWhitespace()
         endWithNewline()
-        // make sure every file has the following copyright header.
-        // optionally, Spotless can set copyright years by digging
-        // through git history (see "license" section below).
+        // make sure every file has the following SPDX header.
         // The delimiter override below is required to support some
         // of our test classes which are in the default package.
         licenseHeader(
             """
-           /*
-            * Copyright (C) ${'$'}YEAR Hedera Hashgraph, LLC
-            *
-            * Licensed under the Apache License, Version 2.0 (the "License");
-            * you may not use this file except in compliance with the License.
-            * You may obtain a copy of the License at
-            *
-            *      http://www.apache.org/licenses/LICENSE-2.0
-            *
-            * Unless required by applicable law or agreed to in writing, software
-            * distributed under the License is distributed on an "AS IS" BASIS,
-            * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-            * See the License for the specific language governing permissions and
-            * limitations under the License.
-            */${"\n\n"}
+           // SPDX-License-Identifier: Apache-2.0
         """
                 .trimIndent(),
             "(package|import)"
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.spotless-kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.spotless-kotlin-conventions.gradle.kts
index 430a8944f..4158fffd6 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.spotless-kotlin-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.spotless-kotlin-conventions.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("com.diffplug.spotless") }
 
 spotless {
@@ -22,21 +7,7 @@ spotless {
 
         licenseHeader(
             """
-           /*
-            * Copyright (C) ${'$'}YEAR Hedera Hashgraph, LLC
-            *
-            * Licensed under the Apache License, Version 2.0 (the "License");
-            * you may not use this file except in compliance with the License.
-            * You may obtain a copy of the License at
-            *
-            *      http://www.apache.org/licenses/LICENSE-2.0
-            *
-            * Unless required by applicable law or agreed to in writing, software
-            * distributed under the License is distributed on an "AS IS" BASIS,
-            * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-            * See the License for the specific language governing permissions and
-            * limitations under the License.
-            */${"\n\n"}
+            // SPDX-License-Identifier: Apache-2.0
             """
                 .trimIndent(),
             "(import|plugins|repositories)",
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.suites.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.suites.gradle.kts
index f5361b330..88e93fc07 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.suites.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.suites.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("application")
     id("com.hedera.block.conventions")
diff --git a/buildSrc/src/main/kotlin/com.hedera.block.tools.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.tools.gradle.kts
index 0779a3619..ec355bd2d 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.tools.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.tools.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("application")
     id("com.hedera.block.conventions")
diff --git a/buildSrc/src/main/kotlin/com/hedera/block/tasks/GitClone.kt b/buildSrc/src/main/kotlin/com/hedera/block/tasks/GitClone.kt
index d47c11dc6..69e3c1442 100644
--- a/buildSrc/src/main/kotlin/com/hedera/block/tasks/GitClone.kt
+++ b/buildSrc/src/main/kotlin/com/hedera/block/tasks/GitClone.kt
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tasks
 
 import javax.inject.Inject
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 59f22acc5..50188d250 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("java-library")
     id("com.hedera.block.common")
diff --git a/common/src/main/java/com/hedera/block/common/constants/StringsConstants.java b/common/src/main/java/com/hedera/block/common/constants/StringsConstants.java
index 4aa7a0b7b..492d40e6e 100644
--- a/common/src/main/java/com/hedera/block/common/constants/StringsConstants.java
+++ b/common/src/main/java/com/hedera/block/common/constants/StringsConstants.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.common.constants;
 
 /** A class that hold common String literals used across projects. */
diff --git a/common/src/main/java/com/hedera/block/common/utils/ChunkUtils.java b/common/src/main/java/com/hedera/block/common/utils/ChunkUtils.java
index 671343040..0dff48c45 100644
--- a/common/src/main/java/com/hedera/block/common/utils/ChunkUtils.java
+++ b/common/src/main/java/com/hedera/block/common/utils/ChunkUtils.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.common.utils;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -34,8 +19,7 @@ public final class ChunkUtils {
      * @param <T> the type of the collection
      * @return a list of lists of the specified size
      *  */
-    public static <T> List<List<T>> chunkify(
-            @NonNull final Collection<T> dataToSplit, final int chunkSize) {
+    public static <T> List<List<T>> chunkify(@NonNull final Collection<T> dataToSplit, final int chunkSize) {
         Objects.requireNonNull(dataToSplit);
         if (chunkSize <= 0) {
             throw new IllegalArgumentException("Chunk size must be greater than 0");
diff --git a/common/src/main/java/com/hedera/block/common/utils/FileUtilities.java b/common/src/main/java/com/hedera/block/common/utils/FileUtilities.java
index 1458af04b..253c60661 100644
--- a/common/src/main/java/com/hedera/block/common/utils/FileUtilities.java
+++ b/common/src/main/java/com/hedera/block/common/utils/FileUtilities.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.common.utils;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
diff --git a/common/src/main/java/com/hedera/block/common/utils/MathUtilities.java b/common/src/main/java/com/hedera/block/common/utils/MathUtilities.java
index 0084d526e..89d3f6bce 100644
--- a/common/src/main/java/com/hedera/block/common/utils/MathUtilities.java
+++ b/common/src/main/java/com/hedera/block/common/utils/MathUtilities.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.common.utils;
 
 /**
diff --git a/common/src/main/java/com/hedera/block/common/utils/Preconditions.java b/common/src/main/java/com/hedera/block/common/utils/Preconditions.java
index d2909a154..732235609 100644
--- a/common/src/main/java/com/hedera/block/common/utils/Preconditions.java
+++ b/common/src/main/java/com/hedera/block/common/utils/Preconditions.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.common.utils;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
diff --git a/common/src/main/java/com/hedera/block/common/utils/StringUtilities.java b/common/src/main/java/com/hedera/block/common/utils/StringUtilities.java
index d5d24ff4b..7702ad410 100644
--- a/common/src/main/java/com/hedera/block/common/utils/StringUtilities.java
+++ b/common/src/main/java/com/hedera/block/common/utils/StringUtilities.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.common.utils;
 
 import java.util.Objects;
diff --git a/common/src/test/java/com/hedera/block/common/CommonsTestUtility.java b/common/src/test/java/com/hedera/block/common/CommonsTestUtility.java
index 352806d06..468ca6f21 100644
--- a/common/src/test/java/com/hedera/block/common/CommonsTestUtility.java
+++ b/common/src/test/java/com/hedera/block/common/CommonsTestUtility.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.common;
 
 import java.util.stream.Stream;
diff --git a/common/src/test/java/com/hedera/block/common/utils/ChunkUtilsTest.java b/common/src/test/java/com/hedera/block/common/utils/ChunkUtilsTest.java
index 5f206110b..bc93fea9c 100644
--- a/common/src/test/java/com/hedera/block/common/utils/ChunkUtilsTest.java
+++ b/common/src/test/java/com/hedera/block/common/utils/ChunkUtilsTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.common.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -37,16 +22,14 @@ public void testEmptyCollection() {
     @Test
     public void testChunkSizeZero() {
         List<Integer> list = Arrays.asList(1, 2, 3);
-        Exception exception =
-                assertThrows(IllegalArgumentException.class, () -> ChunkUtils.chunkify(list, 0));
+        Exception exception = assertThrows(IllegalArgumentException.class, () -> ChunkUtils.chunkify(list, 0));
         assertEquals("Chunk size must be greater than 0", exception.getMessage());
     }
 
     @Test
     public void testChunkSizeNegative() {
         List<Integer> list = Arrays.asList(1, 2, 3);
-        Exception exception =
-                assertThrows(IllegalArgumentException.class, () -> ChunkUtils.chunkify(list, -1));
+        Exception exception = assertThrows(IllegalArgumentException.class, () -> ChunkUtils.chunkify(list, -1));
         assertEquals("Chunk size must be greater than 0", exception.getMessage());
     }
 
diff --git a/common/src/test/java/com/hedera/block/common/utils/FileUtilitiesTest.java b/common/src/test/java/com/hedera/block/common/utils/FileUtilitiesTest.java
index 24bbf02f9..2f4011d5b 100644
--- a/common/src/test/java/com/hedera/block/common/utils/FileUtilitiesTest.java
+++ b/common/src/test/java/com/hedera/block/common/utils/FileUtilitiesTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.common.utils;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/common/src/test/java/com/hedera/block/common/utils/MathUtilitiesTest.java b/common/src/test/java/com/hedera/block/common/utils/MathUtilitiesTest.java
index 034c1c88e..7f2c4e868 100644
--- a/common/src/test/java/com/hedera/block/common/utils/MathUtilitiesTest.java
+++ b/common/src/test/java/com/hedera/block/common/utils/MathUtilitiesTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.common.utils;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/common/src/test/java/com/hedera/block/common/utils/PreconditionsTest.java b/common/src/test/java/com/hedera/block/common/utils/PreconditionsTest.java
index de044a883..303cba7e4 100644
--- a/common/src/test/java/com/hedera/block/common/utils/PreconditionsTest.java
+++ b/common/src/test/java/com/hedera/block/common/utils/PreconditionsTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.common.utils;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/common/src/test/java/com/hedera/block/common/utils/StringUtilitiesTest.java b/common/src/test/java/com/hedera/block/common/utils/StringUtilitiesTest.java
index 2619fb87a..02d556069 100644
--- a/common/src/test/java/com/hedera/block/common/utils/StringUtilitiesTest.java
+++ b/common/src/test/java/com/hedera/block/common/utils/StringUtilitiesTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.common.utils;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index 25592c617..a1a2fa572 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("application")
     id("com.hedera.block.server")
diff --git a/server/src/main/java/com/hedera/block/server/BlockNodeApp.java b/server/src/main/java/com/hedera/block/server/BlockNodeApp.java
index 5f18136b7..5ef29cd75 100644
--- a/server/src/main/java/com/hedera/block/server/BlockNodeApp.java
+++ b/server/src/main/java/com/hedera/block/server/BlockNodeApp.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server;
 
 import static com.hedera.block.server.Constants.PBJ_PROTOCOL_PROVIDER_CONFIG_NAME;
diff --git a/server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionComponent.java b/server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionComponent.java
index ca109812e..66aec5f68 100644
--- a/server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionComponent.java
+++ b/server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionComponent.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server;
 
 import com.hedera.block.server.config.ConfigInjectionModule;
diff --git a/server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionModule.java b/server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionModule.java
index 719a90b73..2cce60336 100644
--- a/server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionModule.java
+++ b/server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionModule.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server;
 
 import com.hedera.block.server.config.BlockNodeContext;
@@ -40,8 +25,7 @@ public interface BlockNodeAppInjectionModule {
      */
     @Singleton
     @Provides
-    static BlockNodeContext provideBlockNodeContext(
-            Configuration config, MetricsService metricsService) {
+    static BlockNodeContext provideBlockNodeContext(Configuration config, MetricsService metricsService) {
         return new BlockNodeContext(metricsService, config);
     }
 
diff --git a/server/src/main/java/com/hedera/block/server/Constants.java b/server/src/main/java/com/hedera/block/server/Constants.java
index 1870db7ef..162c98f65 100644
--- a/server/src/main/java/com/hedera/block/server/Constants.java
+++ b/server/src/main/java/com/hedera/block/server/Constants.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server;
 
 /** Constants used in the BlockNode service. */
diff --git a/server/src/main/java/com/hedera/block/server/Server.java b/server/src/main/java/com/hedera/block/server/Server.java
index 89c7dc580..fce6d2da5 100644
--- a/server/src/main/java/com/hedera/block/server/Server.java
+++ b/server/src/main/java/com/hedera/block/server/Server.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server;
 
 import static com.hedera.block.common.constants.StringsConstants.APPLICATION_PROPERTIES;
diff --git a/server/src/main/java/com/hedera/block/server/ServerConfig.java b/server/src/main/java/com/hedera/block/server/ServerConfig.java
index b10e8e6c4..f16df1882 100644
--- a/server/src/main/java/com/hedera/block/server/ServerConfig.java
+++ b/server/src/main/java/com/hedera/block/server/ServerConfig.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server;
 
 import com.swirlds.config.api.ConfigData;
diff --git a/server/src/main/java/com/hedera/block/server/config/BlockNodeConfigExtension.java b/server/src/main/java/com/hedera/block/server/config/BlockNodeConfigExtension.java
index 48b032784..abed8006d 100644
--- a/server/src/main/java/com/hedera/block/server/config/BlockNodeConfigExtension.java
+++ b/server/src/main/java/com/hedera/block/server/config/BlockNodeConfigExtension.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.config;
 
 import com.google.auto.service.AutoService;
diff --git a/server/src/main/java/com/hedera/block/server/config/BlockNodeContext.java b/server/src/main/java/com/hedera/block/server/config/BlockNodeContext.java
index 3d3fa4524..d2b3a906b 100644
--- a/server/src/main/java/com/hedera/block/server/config/BlockNodeContext.java
+++ b/server/src/main/java/com/hedera/block/server/config/BlockNodeContext.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.config;
 
 import com.hedera.block.server.metrics.MetricsService;
@@ -27,5 +12,4 @@
  * @param metricsService the service responsible for handling metrics
  * @param configuration the configuration settings for the block node
  */
-public record BlockNodeContext(
-        @NonNull MetricsService metricsService, @NonNull Configuration configuration) {}
+public record BlockNodeContext(@NonNull MetricsService metricsService, @NonNull Configuration configuration) {}
diff --git a/server/src/main/java/com/hedera/block/server/config/ConfigInjectionModule.java b/server/src/main/java/com/hedera/block/server/config/ConfigInjectionModule.java
index e8c2550cd..e2d08dbed 100644
--- a/server/src/main/java/com/hedera/block/server/config/ConfigInjectionModule.java
+++ b/server/src/main/java/com/hedera/block/server/config/ConfigInjectionModule.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.config;
 
 import com.hedera.block.server.ServerConfig;
diff --git a/server/src/main/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializer.java b/server/src/main/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializer.java
index f347b882e..ee3782ce5 100644
--- a/server/src/main/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializer.java
+++ b/server/src/main/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializer.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.config;
 
 import com.swirlds.config.extensions.sources.ConfigMapping;
diff --git a/server/src/main/java/com/hedera/block/server/consumer/ConsumerConfig.java b/server/src/main/java/com/hedera/block/server/consumer/ConsumerConfig.java
index 12baba621..1a1840ec8 100644
--- a/server/src/main/java/com/hedera/block/server/consumer/ConsumerConfig.java
+++ b/server/src/main/java/com/hedera/block/server/consumer/ConsumerConfig.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.consumer;
 
 import com.swirlds.config.api.ConfigData;
@@ -40,7 +25,6 @@ public record ConsumerConfig(@ConfigProperty(defaultValue = "1500") long timeout
         }
 
         LOGGER.log(
-                System.Logger.Level.INFO,
-                "Consumer configuration timeoutThresholdMillis: " + timeoutThresholdMillis);
+                System.Logger.Level.INFO, "Consumer configuration timeoutThresholdMillis: " + timeoutThresholdMillis);
     }
 }
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
index 85a1cb061..20c39e65b 100644
--- a/server/src/main/java/com/hedera/block/server/consumer/ConsumerStreamResponseObserver.java
+++ b/server/src/main/java/com/hedera/block/server/consumer/ConsumerStreamResponseObserver.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.consumer;
 
 import static java.lang.System.Logger;
diff --git a/server/src/main/java/com/hedera/block/server/events/BlockNodeEventHandler.java b/server/src/main/java/com/hedera/block/server/events/BlockNodeEventHandler.java
index 8c21af2a0..e5c61f992 100644
--- a/server/src/main/java/com/hedera/block/server/events/BlockNodeEventHandler.java
+++ b/server/src/main/java/com/hedera/block/server/events/BlockNodeEventHandler.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.events;
 
 import com.lmax.disruptor.EventHandler;
diff --git a/server/src/main/java/com/hedera/block/server/events/LivenessCalculator.java b/server/src/main/java/com/hedera/block/server/events/LivenessCalculator.java
index c62187bed..47dd3f6ef 100644
--- a/server/src/main/java/com/hedera/block/server/events/LivenessCalculator.java
+++ b/server/src/main/java/com/hedera/block/server/events/LivenessCalculator.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.events;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -35,8 +20,7 @@ public final class LivenessCalculator {
      * @param clock the clock to use for time calculations
      * @param timeoutThresholdMillis the timeout threshold in milliseconds
      */
-    public LivenessCalculator(
-            @NonNull final InstantSource clock, final long timeoutThresholdMillis) {
+    public LivenessCalculator(@NonNull final InstantSource clock, final long timeoutThresholdMillis) {
 
         this.clock = clock;
         this.timeoutThresholdMillis = timeoutThresholdMillis;
diff --git a/server/src/main/java/com/hedera/block/server/events/ObjectEvent.java b/server/src/main/java/com/hedera/block/server/events/ObjectEvent.java
index 40c59c6a3..8597b7363 100644
--- a/server/src/main/java/com/hedera/block/server/events/ObjectEvent.java
+++ b/server/src/main/java/com/hedera/block/server/events/ObjectEvent.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.events;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
diff --git a/server/src/main/java/com/hedera/block/server/exception/BlockStreamProtocolException.java b/server/src/main/java/com/hedera/block/server/exception/BlockStreamProtocolException.java
index e54140f14..b48d1bd78 100644
--- a/server/src/main/java/com/hedera/block/server/exception/BlockStreamProtocolException.java
+++ b/server/src/main/java/com/hedera/block/server/exception/BlockStreamProtocolException.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.exception;
 
 /**
diff --git a/server/src/main/java/com/hedera/block/server/health/HealthInjectionModule.java b/server/src/main/java/com/hedera/block/server/health/HealthInjectionModule.java
index 377cbc537..e3870bf24 100644
--- a/server/src/main/java/com/hedera/block/server/health/HealthInjectionModule.java
+++ b/server/src/main/java/com/hedera/block/server/health/HealthInjectionModule.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.health;
 
 import dagger.Binds;
diff --git a/server/src/main/java/com/hedera/block/server/health/HealthService.java b/server/src/main/java/com/hedera/block/server/health/HealthService.java
index e18b37a17..dac9ba97f 100644
--- a/server/src/main/java/com/hedera/block/server/health/HealthService.java
+++ b/server/src/main/java/com/hedera/block/server/health/HealthService.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.health;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
diff --git a/server/src/main/java/com/hedera/block/server/health/HealthServiceImpl.java b/server/src/main/java/com/hedera/block/server/health/HealthServiceImpl.java
index f790c4498..a29cc62c3 100644
--- a/server/src/main/java/com/hedera/block/server/health/HealthServiceImpl.java
+++ b/server/src/main/java/com/hedera/block/server/health/HealthServiceImpl.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.health;
 
 import com.hedera.block.server.service.ServiceStatus;
@@ -66,8 +51,7 @@ public void routing(@NonNull final HttpRules httpRules) {
      * @param res the server response
      */
     @Override
-    public final void handleLivez(
-            @NonNull final ServerRequest req, @NonNull final ServerResponse res) {
+    public final void handleLivez(@NonNull final ServerRequest req, @NonNull final ServerResponse res) {
         if (serviceStatus.isRunning()) {
             res.status(200).send("OK");
         } else {
@@ -83,8 +67,7 @@ public final void handleLivez(
      * @param res the server response
      */
     @Override
-    public final void handleReadyz(
-            @NonNull final ServerRequest req, @NonNull final ServerResponse res) {
+    public final void handleReadyz(@NonNull final ServerRequest req, @NonNull final ServerResponse res) {
         if (serviceStatus.isRunning()) {
             res.status(200).send("OK");
         } else {
diff --git a/server/src/main/java/com/hedera/block/server/mediator/LiveStreamMediator.java b/server/src/main/java/com/hedera/block/server/mediator/LiveStreamMediator.java
index 25d2d354e..b4fb292d0 100644
--- a/server/src/main/java/com/hedera/block/server/mediator/LiveStreamMediator.java
+++ b/server/src/main/java/com/hedera/block/server/mediator/LiveStreamMediator.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.mediator;
 
 import com.hedera.block.server.notifier.Notifiable;
diff --git a/server/src/main/java/com/hedera/block/server/mediator/LiveStreamMediatorBuilder.java b/server/src/main/java/com/hedera/block/server/mediator/LiveStreamMediatorBuilder.java
index a547f2b60..e75291b00 100644
--- a/server/src/main/java/com/hedera/block/server/mediator/LiveStreamMediatorBuilder.java
+++ b/server/src/main/java/com/hedera/block/server/mediator/LiveStreamMediatorBuilder.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.mediator;
 
 import com.hedera.block.server.config.BlockNodeContext;
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
index a7c30304d..4f965654c 100644
--- a/server/src/main/java/com/hedera/block/server/mediator/LiveStreamMediatorImpl.java
+++ b/server/src/main/java/com/hedera/block/server/mediator/LiveStreamMediatorImpl.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.mediator;
 
 import static com.hedera.block.server.metrics.BlockNodeMetricTypes.Counter.LiveBlockItems;
diff --git a/server/src/main/java/com/hedera/block/server/mediator/MediatorConfig.java b/server/src/main/java/com/hedera/block/server/mediator/MediatorConfig.java
index 6c2f939ed..247d0cf7a 100644
--- a/server/src/main/java/com/hedera/block/server/mediator/MediatorConfig.java
+++ b/server/src/main/java/com/hedera/block/server/mediator/MediatorConfig.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.mediator;
 
 import static java.lang.System.Logger.Level.INFO;
diff --git a/server/src/main/java/com/hedera/block/server/mediator/MediatorInjectionModule.java b/server/src/main/java/com/hedera/block/server/mediator/MediatorInjectionModule.java
index fc4be38af..30cb32b7d 100644
--- a/server/src/main/java/com/hedera/block/server/mediator/MediatorInjectionModule.java
+++ b/server/src/main/java/com/hedera/block/server/mediator/MediatorInjectionModule.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.mediator;
 
 import com.hedera.block.server.config.BlockNodeContext;
diff --git a/server/src/main/java/com/hedera/block/server/mediator/NoOpLiveStreamMediator.java b/server/src/main/java/com/hedera/block/server/mediator/NoOpLiveStreamMediator.java
index 5a2ea6573..97d413ec0 100644
--- a/server/src/main/java/com/hedera/block/server/mediator/NoOpLiveStreamMediator.java
+++ b/server/src/main/java/com/hedera/block/server/mediator/NoOpLiveStreamMediator.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.mediator;
 
 import static com.hedera.block.server.metrics.BlockNodeMetricTypes.Counter.LiveBlockItems;
diff --git a/server/src/main/java/com/hedera/block/server/mediator/Publisher.java b/server/src/main/java/com/hedera/block/server/mediator/Publisher.java
index b31e3ba66..01d34ee11 100644
--- a/server/src/main/java/com/hedera/block/server/mediator/Publisher.java
+++ b/server/src/main/java/com/hedera/block/server/mediator/Publisher.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.mediator;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
diff --git a/server/src/main/java/com/hedera/block/server/mediator/StreamMediator.java b/server/src/main/java/com/hedera/block/server/mediator/StreamMediator.java
index 87e2d4030..8766d1de6 100644
--- a/server/src/main/java/com/hedera/block/server/mediator/StreamMediator.java
+++ b/server/src/main/java/com/hedera/block/server/mediator/StreamMediator.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.mediator;
 
 /**
diff --git a/server/src/main/java/com/hedera/block/server/mediator/SubscriptionHandler.java b/server/src/main/java/com/hedera/block/server/mediator/SubscriptionHandler.java
index 391b1a909..fe1f7457e 100644
--- a/server/src/main/java/com/hedera/block/server/mediator/SubscriptionHandler.java
+++ b/server/src/main/java/com/hedera/block/server/mediator/SubscriptionHandler.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.mediator;
 
 import com.hedera.block.server.events.BlockNodeEventHandler;
diff --git a/server/src/main/java/com/hedera/block/server/mediator/SubscriptionHandlerBase.java b/server/src/main/java/com/hedera/block/server/mediator/SubscriptionHandlerBase.java
index 6cf2330b0..ea0f71401 100644
--- a/server/src/main/java/com/hedera/block/server/mediator/SubscriptionHandlerBase.java
+++ b/server/src/main/java/com/hedera/block/server/mediator/SubscriptionHandlerBase.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.mediator;
 
 import com.hedera.block.server.events.BlockNodeEventHandler;
diff --git a/server/src/main/java/com/hedera/block/server/metrics/BlockNodeMetricTypes.java b/server/src/main/java/com/hedera/block/server/metrics/BlockNodeMetricTypes.java
index 50c582269..c211adfb3 100644
--- a/server/src/main/java/com/hedera/block/server/metrics/BlockNodeMetricTypes.java
+++ b/server/src/main/java/com/hedera/block/server/metrics/BlockNodeMetricTypes.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.metrics;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
diff --git a/server/src/main/java/com/hedera/block/server/metrics/MetricsInjectionModule.java b/server/src/main/java/com/hedera/block/server/metrics/MetricsInjectionModule.java
index 96c001ad9..44713dd98 100644
--- a/server/src/main/java/com/hedera/block/server/metrics/MetricsInjectionModule.java
+++ b/server/src/main/java/com/hedera/block/server/metrics/MetricsInjectionModule.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.metrics;
 
 import com.swirlds.common.metrics.platform.DefaultMetricsProvider;
diff --git a/server/src/main/java/com/hedera/block/server/metrics/MetricsService.java b/server/src/main/java/com/hedera/block/server/metrics/MetricsService.java
index 59dea3097..2a2857e52 100644
--- a/server/src/main/java/com/hedera/block/server/metrics/MetricsService.java
+++ b/server/src/main/java/com/hedera/block/server/metrics/MetricsService.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.metrics;
 
 import com.swirlds.metrics.api.Counter;
diff --git a/server/src/main/java/com/hedera/block/server/metrics/MetricsServiceImpl.java b/server/src/main/java/com/hedera/block/server/metrics/MetricsServiceImpl.java
index 0a38cd5ee..31a46b237 100644
--- a/server/src/main/java/com/hedera/block/server/metrics/MetricsServiceImpl.java
+++ b/server/src/main/java/com/hedera/block/server/metrics/MetricsServiceImpl.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.metrics;
 
 import com.swirlds.metrics.api.Counter;
diff --git a/server/src/main/java/com/hedera/block/server/notifier/Notifiable.java b/server/src/main/java/com/hedera/block/server/notifier/Notifiable.java
index 3d5c869eb..387d7fdd4 100644
--- a/server/src/main/java/com/hedera/block/server/notifier/Notifiable.java
+++ b/server/src/main/java/com/hedera/block/server/notifier/Notifiable.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.notifier;
 
 /** Use this interface contract to notify the implementation of critical system events. */
diff --git a/server/src/main/java/com/hedera/block/server/notifier/Notifier.java b/server/src/main/java/com/hedera/block/server/notifier/Notifier.java
index 3e81e0869..76d7e9f6b 100644
--- a/server/src/main/java/com/hedera/block/server/notifier/Notifier.java
+++ b/server/src/main/java/com/hedera/block/server/notifier/Notifier.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.notifier;
 
 import com.hedera.block.server.mediator.StreamMediator;
diff --git a/server/src/main/java/com/hedera/block/server/notifier/NotifierConfig.java b/server/src/main/java/com/hedera/block/server/notifier/NotifierConfig.java
index 3b753d9b6..52a2a2951 100644
--- a/server/src/main/java/com/hedera/block/server/notifier/NotifierConfig.java
+++ b/server/src/main/java/com/hedera/block/server/notifier/NotifierConfig.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.notifier;
 
 import static java.lang.System.Logger.Level.INFO;
diff --git a/server/src/main/java/com/hedera/block/server/notifier/NotifierImpl.java b/server/src/main/java/com/hedera/block/server/notifier/NotifierImpl.java
index 98f494967..21558275a 100644
--- a/server/src/main/java/com/hedera/block/server/notifier/NotifierImpl.java
+++ b/server/src/main/java/com/hedera/block/server/notifier/NotifierImpl.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.notifier;
 
 import static com.hedera.block.server.metrics.BlockNodeMetricTypes.Counter.SuccessfulPubStreamResp;
diff --git a/server/src/main/java/com/hedera/block/server/notifier/NotifierInjectionModule.java b/server/src/main/java/com/hedera/block/server/notifier/NotifierInjectionModule.java
index f9c950e60..34976770f 100644
--- a/server/src/main/java/com/hedera/block/server/notifier/NotifierInjectionModule.java
+++ b/server/src/main/java/com/hedera/block/server/notifier/NotifierInjectionModule.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.notifier;
 
 import dagger.Binds;
diff --git a/server/src/main/java/com/hedera/block/server/pbj/PbjBlockAccessService.java b/server/src/main/java/com/hedera/block/server/pbj/PbjBlockAccessService.java
index 83dce954f..cc1dd1e1f 100644
--- a/server/src/main/java/com/hedera/block/server/pbj/PbjBlockAccessService.java
+++ b/server/src/main/java/com/hedera/block/server/pbj/PbjBlockAccessService.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.pbj;
 
 import static com.hedera.block.server.Constants.FULL_SERVICE_NAME_BLOCK_ACCESS;
diff --git a/server/src/main/java/com/hedera/block/server/pbj/PbjBlockAccessServiceProxy.java b/server/src/main/java/com/hedera/block/server/pbj/PbjBlockAccessServiceProxy.java
index 26417c5ad..4e9b7f7aa 100644
--- a/server/src/main/java/com/hedera/block/server/pbj/PbjBlockAccessServiceProxy.java
+++ b/server/src/main/java/com/hedera/block/server/pbj/PbjBlockAccessServiceProxy.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.pbj;
 
 import static com.hedera.block.server.metrics.BlockNodeMetricTypes.Counter.SingleBlocksNotFound;
diff --git a/server/src/main/java/com/hedera/block/server/pbj/PbjBlockStreamService.java b/server/src/main/java/com/hedera/block/server/pbj/PbjBlockStreamService.java
index fe2979168..f53128211 100644
--- a/server/src/main/java/com/hedera/block/server/pbj/PbjBlockStreamService.java
+++ b/server/src/main/java/com/hedera/block/server/pbj/PbjBlockStreamService.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.pbj;
 
 import static com.hedera.block.server.Constants.FULL_SERVICE_NAME_BLOCK_STREAM;
diff --git a/server/src/main/java/com/hedera/block/server/pbj/PbjBlockStreamServiceProxy.java b/server/src/main/java/com/hedera/block/server/pbj/PbjBlockStreamServiceProxy.java
index fa51fdfcd..965b0e1db 100644
--- a/server/src/main/java/com/hedera/block/server/pbj/PbjBlockStreamServiceProxy.java
+++ b/server/src/main/java/com/hedera/block/server/pbj/PbjBlockStreamServiceProxy.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.pbj;
 
 import static java.lang.System.Logger.Level.DEBUG;
diff --git a/server/src/main/java/com/hedera/block/server/pbj/PbjInjectionModule.java b/server/src/main/java/com/hedera/block/server/pbj/PbjInjectionModule.java
index 0020ec28f..4840006fd 100644
--- a/server/src/main/java/com/hedera/block/server/pbj/PbjInjectionModule.java
+++ b/server/src/main/java/com/hedera/block/server/pbj/PbjInjectionModule.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.pbj;
 
 import dagger.Binds;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/PersistenceInjectionModule.java b/server/src/main/java/com/hedera/block/server/persistence/PersistenceInjectionModule.java
index a4f3ec550..aba546dae 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/PersistenceInjectionModule.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/PersistenceInjectionModule.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence;
 
 import com.hedera.block.server.config.BlockNodeContext;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/StreamPersistenceHandlerImpl.java b/server/src/main/java/com/hedera/block/server/persistence/StreamPersistenceHandlerImpl.java
index 6f4174a86..42649e88d 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/StreamPersistenceHandlerImpl.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/StreamPersistenceHandlerImpl.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence;
 
 import static com.hedera.block.server.metrics.BlockNodeMetricTypes.Counter.StreamPersistenceHandlerError;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/PersistenceStorageConfig.java b/server/src/main/java/com/hedera/block/server/persistence/storage/PersistenceStorageConfig.java
index 73311320d..5abd53a48 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/PersistenceStorageConfig.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/PersistenceStorageConfig.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage;
 
 import static com.hedera.block.server.Constants.BLOCK_NODE_ARCHIVE_ROOT_DIRECTORY_SEMANTIC_NAME;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/compression/Compression.java b/server/src/main/java/com/hedera/block/server/persistence/storage/compression/Compression.java
index dccdf19a8..eed09b46b 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/compression/Compression.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/compression/Compression.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.compression;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/compression/NoOpCompression.java b/server/src/main/java/com/hedera/block/server/persistence/storage/compression/NoOpCompression.java
index 33f459227..d4bc5b5a0 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/compression/NoOpCompression.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/compression/NoOpCompression.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.compression;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/compression/ZstdCompression.java b/server/src/main/java/com/hedera/block/server/persistence/storage/compression/ZstdCompression.java
index 86d2f6e09..415a84a8b 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/compression/ZstdCompression.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/compression/ZstdCompression.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.compression;
 
 import com.github.luben.zstd.ZstdOutputStream;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalDirPathResolver.java b/server/src/main/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalDirPathResolver.java
index 03299ac17..d625bb662 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalDirPathResolver.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalDirPathResolver.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.path;
 
 import com.hedera.block.common.utils.Preconditions;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalFilePathResolver.java b/server/src/main/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalFilePathResolver.java
index 0a5966dae..b521414d4 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalFilePathResolver.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalFilePathResolver.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.path;
 
 import com.hedera.block.common.utils.Preconditions;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/path/BlockPathResolver.java b/server/src/main/java/com/hedera/block/server/persistence/storage/path/BlockPathResolver.java
index d812ca3f7..cb221a813 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/path/BlockPathResolver.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/path/BlockPathResolver.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.path;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/path/NoOpBlockPathResolver.java b/server/src/main/java/com/hedera/block/server/persistence/storage/path/NoOpBlockPathResolver.java
index 4386cc244..8b15e332d 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/path/NoOpBlockPathResolver.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/path/NoOpBlockPathResolver.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.path;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalDirReader.java b/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalDirReader.java
index dc5b19645..064285128 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalDirReader.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalDirReader.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.read;
 
 import static com.hedera.block.server.Constants.BLOCK_FILE_EXTENSION;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalFileReader.java b/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalFileReader.java
index 784cf1df5..7a9e089b3 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalFileReader.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalFileReader.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.read;
 
 import com.hedera.block.common.utils.Preconditions;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockReader.java b/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockReader.java
index 2c7a42bc8..bf2a09aaa 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockReader.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/read/BlockReader.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.read;
 
 import com.hedera.pbj.runtime.ParseException;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/read/LocalBlockReader.java b/server/src/main/java/com/hedera/block/server/persistence/storage/read/LocalBlockReader.java
index 095d26b9f..5550e7eba 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/read/LocalBlockReader.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/read/LocalBlockReader.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.read;
 
 /**
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/read/NoOpBlockReader.java b/server/src/main/java/com/hedera/block/server/persistence/storage/read/NoOpBlockReader.java
index 6d67ad348..1bc723e72 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/read/NoOpBlockReader.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/read/NoOpBlockReader.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.read;
 
 import com.hedera.hapi.block.BlockUnparsed;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalDirRemover.java b/server/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalDirRemover.java
index 85aa5cbce..eb83ed8d2 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalDirRemover.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalDirRemover.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.remove;
 
 import static java.lang.System.Logger;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalFileRemover.java b/server/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalFileRemover.java
index c6065489f..cf5710360 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalFileRemover.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalFileRemover.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.remove;
 
 import com.hedera.block.common.utils.Preconditions;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockRemover.java b/server/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockRemover.java
index 9ece1c3fa..db411f1f8 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockRemover.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/remove/BlockRemover.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.remove;
 
 import java.io.IOException;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/remove/LocalBlockRemover.java b/server/src/main/java/com/hedera/block/server/persistence/storage/remove/LocalBlockRemover.java
index f996f1d81..2dd42542b 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/remove/LocalBlockRemover.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/remove/LocalBlockRemover.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.remove;
 
 /**
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/remove/NoOpBlockRemover.java b/server/src/main/java/com/hedera/block/server/persistence/storage/remove/NoOpBlockRemover.java
index 45313b651..1a76ba5c3 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/remove/NoOpBlockRemover.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/remove/NoOpBlockRemover.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.remove;
 
 /**
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalDirWriter.java b/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalDirWriter.java
index dc468328f..c03b7a23f 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalDirWriter.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalDirWriter.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.write;
 
 import static com.hedera.block.server.Constants.BLOCK_FILE_EXTENSION;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalFileWriter.java b/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalFileWriter.java
index a65f6865c..06c5084e5 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalFileWriter.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalFileWriter.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.write;
 
 import static com.hedera.block.server.metrics.BlockNodeMetricTypes.Counter.BlocksPersisted;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockWriter.java b/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockWriter.java
index a05f6ae23..954a2ef4b 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockWriter.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockWriter.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.write;
 
 import com.hedera.pbj.runtime.ParseException;
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/write/LocalBlockWriter.java b/server/src/main/java/com/hedera/block/server/persistence/storage/write/LocalBlockWriter.java
index d6c6536df..297bfdd08 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/write/LocalBlockWriter.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/write/LocalBlockWriter.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.write;
 
 /**
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/write/NoOpBlockWriter.java b/server/src/main/java/com/hedera/block/server/persistence/storage/write/NoOpBlockWriter.java
index eb8d0b7eb..0ee027831 100644
--- a/server/src/main/java/com/hedera/block/server/persistence/storage/write/NoOpBlockWriter.java
+++ b/server/src/main/java/com/hedera/block/server/persistence/storage/write/NoOpBlockWriter.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.write;
 
 import com.hedera.hapi.block.BlockItemUnparsed;
diff --git a/server/src/main/java/com/hedera/block/server/producer/NoOpProducerObserver.java b/server/src/main/java/com/hedera/block/server/producer/NoOpProducerObserver.java
index 758550741..2ea9c6882 100644
--- a/server/src/main/java/com/hedera/block/server/producer/NoOpProducerObserver.java
+++ b/server/src/main/java/com/hedera/block/server/producer/NoOpProducerObserver.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.producer;
 
 import static com.hedera.block.server.metrics.BlockNodeMetricTypes.Counter.LiveBlockItemsReceived;
diff --git a/server/src/main/java/com/hedera/block/server/producer/ProducerBlockItemObserver.java b/server/src/main/java/com/hedera/block/server/producer/ProducerBlockItemObserver.java
index 21e1bd2af..45f98e00c 100644
--- a/server/src/main/java/com/hedera/block/server/producer/ProducerBlockItemObserver.java
+++ b/server/src/main/java/com/hedera/block/server/producer/ProducerBlockItemObserver.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.producer;
 
 import static com.hedera.block.server.metrics.BlockNodeMetricTypes.Counter.LiveBlockItemsReceived;
diff --git a/server/src/main/java/com/hedera/block/server/producer/ProducerConfig.java b/server/src/main/java/com/hedera/block/server/producer/ProducerConfig.java
index d6f53211d..5a162ba37 100644
--- a/server/src/main/java/com/hedera/block/server/producer/ProducerConfig.java
+++ b/server/src/main/java/com/hedera/block/server/producer/ProducerConfig.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.producer;
 
 import static java.lang.System.Logger.Level.INFO;
diff --git a/server/src/main/java/com/hedera/block/server/producer/Util.java b/server/src/main/java/com/hedera/block/server/producer/Util.java
index 08f323c9f..0c1978734 100644
--- a/server/src/main/java/com/hedera/block/server/producer/Util.java
+++ b/server/src/main/java/com/hedera/block/server/producer/Util.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.producer;
 
 import com.hedera.hapi.block.BlockItemUnparsed;
diff --git a/server/src/main/java/com/hedera/block/server/service/ServiceConfig.java b/server/src/main/java/com/hedera/block/server/service/ServiceConfig.java
index 2c36f4458..a4e7ab24f 100644
--- a/server/src/main/java/com/hedera/block/server/service/ServiceConfig.java
+++ b/server/src/main/java/com/hedera/block/server/service/ServiceConfig.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.service;
 
 import com.swirlds.config.api.ConfigData;
@@ -40,8 +25,6 @@ public record ServiceConfig(@ConfigProperty(defaultValue = "500") int delayMilli
             throw new IllegalArgumentException("Delay milliseconds must be greater than 0");
         }
 
-        LOGGER.log(
-                System.Logger.Level.INFO,
-                "Service configuration service.delayMillis: " + delayMillis);
+        LOGGER.log(System.Logger.Level.INFO, "Service configuration service.delayMillis: " + delayMillis);
     }
 }
diff --git a/server/src/main/java/com/hedera/block/server/service/ServiceInjectionModule.java b/server/src/main/java/com/hedera/block/server/service/ServiceInjectionModule.java
index 3d432ce63..ad4920a69 100644
--- a/server/src/main/java/com/hedera/block/server/service/ServiceInjectionModule.java
+++ b/server/src/main/java/com/hedera/block/server/service/ServiceInjectionModule.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.service;
 
 import dagger.Binds;
diff --git a/server/src/main/java/com/hedera/block/server/service/ServiceStatus.java b/server/src/main/java/com/hedera/block/server/service/ServiceStatus.java
index 744d357ee..464eeffe2 100644
--- a/server/src/main/java/com/hedera/block/server/service/ServiceStatus.java
+++ b/server/src/main/java/com/hedera/block/server/service/ServiceStatus.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.service;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
diff --git a/server/src/main/java/com/hedera/block/server/service/ServiceStatusImpl.java b/server/src/main/java/com/hedera/block/server/service/ServiceStatusImpl.java
index a6d1b8c5b..dca7c5b01 100644
--- a/server/src/main/java/com/hedera/block/server/service/ServiceStatusImpl.java
+++ b/server/src/main/java/com/hedera/block/server/service/ServiceStatusImpl.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.service;
 
 import static java.lang.System.Logger.Level.DEBUG;
@@ -48,8 +33,10 @@ public class ServiceStatusImpl implements ServiceStatus {
      */
     @Inject
     public ServiceStatusImpl(@NonNull final BlockNodeContext blockNodeContext) {
-        this.delayMillis =
-                blockNodeContext.configuration().getConfigData(ServiceConfig.class).delayMillis();
+        this.delayMillis = blockNodeContext
+                .configuration()
+                .getConfigData(ServiceConfig.class)
+                .delayMillis();
     }
 
     /**
diff --git a/server/src/test/java/com/hedera/block/server/BlockNodeAppInjectionModuleTest.java b/server/src/test/java/com/hedera/block/server/BlockNodeAppInjectionModuleTest.java
index 625c59599..b43f5df20 100644
--- a/server/src/test/java/com/hedera/block/server/BlockNodeAppInjectionModuleTest.java
+++ b/server/src/test/java/com/hedera/block/server/BlockNodeAppInjectionModuleTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server;
 
 import com.hedera.block.server.config.BlockNodeContext;
@@ -36,11 +21,14 @@
 
 class BlockNodeAppInjectionModuleTest {
 
-    @Mock private StreamMediator<BlockItem, ObjectEvent<SubscribeStreamResponse>> streamMediator;
+    @Mock
+    private StreamMediator<BlockItem, ObjectEvent<SubscribeStreamResponse>> streamMediator;
 
-    @Mock private BlockReader<Block> blockReader;
+    @Mock
+    private BlockReader<Block> blockReader;
 
-    @Mock private ServiceStatus serviceStatus;
+    @Mock
+    private ServiceStatus serviceStatus;
 
     private BlockNodeContext blockNodeContext;
 
@@ -58,16 +46,13 @@ void testProvideBlockNodeContext() {
                 BlockNodeAppInjectionModule.provideBlockNodeContext(configuration, metricsService);
 
         Assertions.assertEquals(blockNodeContext, providedBlockNodeContext);
-        Assertions.assertEquals(
-                blockNodeContext.configuration(), providedBlockNodeContext.configuration());
-        Assertions.assertEquals(
-                blockNodeContext.metricsService(), providedBlockNodeContext.metricsService());
+        Assertions.assertEquals(blockNodeContext.configuration(), providedBlockNodeContext.configuration());
+        Assertions.assertEquals(blockNodeContext.metricsService(), providedBlockNodeContext.metricsService());
     }
 
     @Test
     void testProvideWebServerConfigBuilder() {
-        WebServerConfig.Builder webServerConfigBuilder =
-                BlockNodeAppInjectionModule.provideWebServerConfigBuilder();
+        WebServerConfig.Builder webServerConfigBuilder = BlockNodeAppInjectionModule.provideWebServerConfigBuilder();
 
         Assertions.assertNotNull(webServerConfigBuilder);
     }
diff --git a/server/src/test/java/com/hedera/block/server/BlockNodeAppTest.java b/server/src/test/java/com/hedera/block/server/BlockNodeAppTest.java
index 001a0857b..4bbf6c14d 100644
--- a/server/src/test/java/com/hedera/block/server/BlockNodeAppTest.java
+++ b/server/src/test/java/com/hedera/block/server/BlockNodeAppTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server;
 
 import static org.mockito.Mockito.any;
diff --git a/server/src/test/java/com/hedera/block/server/ServerConfigTest.java b/server/src/test/java/com/hedera/block/server/ServerConfigTest.java
index 14ab2f077..3c6353ec4 100644
--- a/server/src/test/java/com/hedera/block/server/ServerConfigTest.java
+++ b/server/src/test/java/com/hedera/block/server/ServerConfigTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/server/src/test/java/com/hedera/block/server/config/BlockNodeContextTest.java b/server/src/test/java/com/hedera/block/server/config/BlockNodeContextTest.java
index 09fb091b3..c11b51f83 100644
--- a/server/src/test/java/com/hedera/block/server/config/BlockNodeContextTest.java
+++ b/server/src/test/java/com/hedera/block/server/config/BlockNodeContextTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.config;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/server/src/test/java/com/hedera/block/server/config/ConfigInjectionModuleTest.java b/server/src/test/java/com/hedera/block/server/config/ConfigInjectionModuleTest.java
index 5d2f58824..cb4b10968 100644
--- a/server/src/test/java/com/hedera/block/server/config/ConfigInjectionModuleTest.java
+++ b/server/src/test/java/com/hedera/block/server/config/ConfigInjectionModuleTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.config;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/server/src/test/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializerTest.java b/server/src/test/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializerTest.java
index cbf56264c..908523114 100644
--- a/server/src/test/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializerTest.java
+++ b/server/src/test/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializerTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.config;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/server/src/test/java/com/hedera/block/server/config/TestConfigBuilder.java b/server/src/test/java/com/hedera/block/server/config/TestConfigBuilder.java
index b94c84811..3c6a0e87d 100644
--- a/server/src/test/java/com/hedera/block/server/config/TestConfigBuilder.java
+++ b/server/src/test/java/com/hedera/block/server/config/TestConfigBuilder.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.config;
 
 import com.swirlds.common.config.singleton.ConfigurationHolder;
@@ -90,8 +75,7 @@ public TestConfigBuilder(final boolean registerAllTypes) {
      * @return the {@link TestConfigBuilder} instance (for fluent API)
      */
     @NonNull
-    public TestConfigBuilder withValue(
-            @NonNull final String propertyName, @Nullable final String value) {
+    public TestConfigBuilder withValue(@NonNull final String propertyName, @Nullable final String value) {
         return withSource(new SimpleConfigSource(propertyName, value));
     }
 
@@ -151,8 +135,7 @@ public TestConfigBuilder withValue(@NonNull final String propertyName, final boo
      * @return the {@link TestConfigBuilder} instance (for fluent API)
      */
     @NonNull
-    public TestConfigBuilder withValue(
-            @NonNull final String propertyName, @NonNull final Object value) {
+    public TestConfigBuilder withValue(@NonNull final String propertyName, @NonNull final Object value) {
         Objects.requireNonNull(value, "value must not be null");
         return withSource(new SimpleConfigSource(propertyName, value.toString()));
     }
diff --git a/server/src/test/java/com/hedera/block/server/consumer/ConsumerConfigTest.java b/server/src/test/java/com/hedera/block/server/consumer/ConsumerConfigTest.java
index 6b68fdfdc..3343c3a7f 100644
--- a/server/src/test/java/com/hedera/block/server/consumer/ConsumerConfigTest.java
+++ b/server/src/test/java/com/hedera/block/server/consumer/ConsumerConfigTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.consumer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,8 +16,7 @@ public void testConsumerConfig_happyPath() {
 
     @Test
     public void testConsumerConfig_negativeTimeoutThresholdMillis() {
-        IllegalArgumentException exception =
-                assertThrows(IllegalArgumentException.class, () -> new ConsumerConfig(-1));
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> new ConsumerConfig(-1));
         assertEquals("Timeout threshold must be greater than 0", exception.getMessage());
     }
 }
diff --git a/server/src/test/java/com/hedera/block/server/consumer/ConsumerStreamResponseObserverTest.java b/server/src/test/java/com/hedera/block/server/consumer/ConsumerStreamResponseObserverTest.java
index 46eb25f00..74372b86b 100644
--- a/server/src/test/java/com/hedera/block/server/consumer/ConsumerStreamResponseObserverTest.java
+++ b/server/src/test/java/com/hedera/block/server/consumer/ConsumerStreamResponseObserverTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.consumer;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/server/src/test/java/com/hedera/block/server/grpc/BlockAccessServiceTest.java b/server/src/test/java/com/hedera/block/server/grpc/BlockAccessServiceTest.java
index ad30047b6..ccaf9cbd8 100644
--- a/server/src/test/java/com/hedera/block/server/grpc/BlockAccessServiceTest.java
+++ b/server/src/test/java/com/hedera/block/server/grpc/BlockAccessServiceTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.grpc;
 
 import static com.hedera.block.server.Constants.FULL_SERVICE_NAME_BLOCK_ACCESS;
diff --git a/server/src/test/java/com/hedera/block/server/health/HealthServiceTest.java b/server/src/test/java/com/hedera/block/server/health/HealthServiceTest.java
index d87f257a5..fb2db5317 100644
--- a/server/src/test/java/com/hedera/block/server/health/HealthServiceTest.java
+++ b/server/src/test/java/com/hedera/block/server/health/HealthServiceTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.health;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,11 +20,14 @@ class HealthServiceTest {
     private static final String LIVENESS_PATH = "/livez";
     private static final String HEALTH_PATH = "/healthz";
 
-    @Mock private ServiceStatus serviceStatus;
+    @Mock
+    private ServiceStatus serviceStatus;
 
-    @Mock ServerRequest serverRequest;
+    @Mock
+    ServerRequest serverRequest;
 
-    @Mock ServerResponse serverResponse;
+    @Mock
+    ServerResponse serverResponse;
 
     @Test
     public void testHandleLivez() {
diff --git a/server/src/test/java/com/hedera/block/server/mediator/LiveStreamMediatorImplTest.java b/server/src/test/java/com/hedera/block/server/mediator/LiveStreamMediatorImplTest.java
index 940513fe1..7d1a749af 100644
--- a/server/src/test/java/com/hedera/block/server/mediator/LiveStreamMediatorImplTest.java
+++ b/server/src/test/java/com/hedera/block/server/mediator/LiveStreamMediatorImplTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.mediator;
 
 import static com.hedera.block.server.metrics.BlockNodeMetricTypes.Counter.LiveBlockItems;
diff --git a/server/src/test/java/com/hedera/block/server/mediator/MediatorConfigTest.java b/server/src/test/java/com/hedera/block/server/mediator/MediatorConfigTest.java
index c30eadd3a..01cbf380a 100644
--- a/server/src/test/java/com/hedera/block/server/mediator/MediatorConfigTest.java
+++ b/server/src/test/java/com/hedera/block/server/mediator/MediatorConfigTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.mediator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/server/src/test/java/com/hedera/block/server/mediator/MediatorInjectionModuleTest.java b/server/src/test/java/com/hedera/block/server/mediator/MediatorInjectionModuleTest.java
index 9178cb590..2329710f6 100644
--- a/server/src/test/java/com/hedera/block/server/mediator/MediatorInjectionModuleTest.java
+++ b/server/src/test/java/com/hedera/block/server/mediator/MediatorInjectionModuleTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.mediator;
 
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
diff --git a/server/src/test/java/com/hedera/block/server/metrics/MetricsInjectionModuleTest.java b/server/src/test/java/com/hedera/block/server/metrics/MetricsInjectionModuleTest.java
index 21305a762..5317fefd7 100644
--- a/server/src/test/java/com/hedera/block/server/metrics/MetricsInjectionModuleTest.java
+++ b/server/src/test/java/com/hedera/block/server/metrics/MetricsInjectionModuleTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.metrics;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/server/src/test/java/com/hedera/block/server/metrics/MetricsServiceTest.java b/server/src/test/java/com/hedera/block/server/metrics/MetricsServiceTest.java
index 35fe4cb7b..0169dfbdb 100644
--- a/server/src/test/java/com/hedera/block/server/metrics/MetricsServiceTest.java
+++ b/server/src/test/java/com/hedera/block/server/metrics/MetricsServiceTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.metrics;
 
 import static com.hedera.block.server.metrics.BlockNodeMetricTypes.Counter.BlocksPersisted;
@@ -54,8 +39,7 @@ public void setUp() throws IOException {
         final BlockNodeContext context = TestConfigUtil.getTestBlockNodeContext();
         final Configuration configuration = context.configuration();
         final MetricsServiceTestComponent testComponent =
-                DaggerMetricsServiceTest_MetricsServiceTestComponent.factory()
-                        .create(configuration);
+                DaggerMetricsServiceTest_MetricsServiceTestComponent.factory().create(configuration);
         this.metricsService = testComponent.getMetricsService();
     }
 
@@ -66,7 +50,9 @@ void MetricsService_verifyLiveBlockItemsCounter() {
             metricsService.get(LiveBlockItems).increment();
         }
 
-        assertEquals(LiveBlockItems.grafanaLabel(), metricsService.get(LiveBlockItems).getName());
+        assertEquals(
+                LiveBlockItems.grafanaLabel(),
+                metricsService.get(LiveBlockItems).getName());
         assertEquals(
                 LiveBlockItems.description(), metricsService.get(LiveBlockItems).getDescription());
         assertEquals(10, metricsService.get(LiveBlockItems).get());
@@ -79,7 +65,9 @@ void MetricsService_verifyBlocksPersistedCounter() {
             metricsService.get(BlocksPersisted).increment();
         }
 
-        assertEquals(BlocksPersisted.grafanaLabel(), metricsService.get(BlocksPersisted).getName());
+        assertEquals(
+                BlocksPersisted.grafanaLabel(),
+                metricsService.get(BlocksPersisted).getName());
         assertEquals(
                 BlocksPersisted.description(),
                 metricsService.get(BlocksPersisted).getDescription());
diff --git a/server/src/test/java/com/hedera/block/server/notifier/NotifierConfigTest.java b/server/src/test/java/com/hedera/block/server/notifier/NotifierConfigTest.java
index 8852284af..d9d57c369 100644
--- a/server/src/test/java/com/hedera/block/server/notifier/NotifierConfigTest.java
+++ b/server/src/test/java/com/hedera/block/server/notifier/NotifierConfigTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.notifier;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/server/src/test/java/com/hedera/block/server/notifier/NotifierImplTest.java b/server/src/test/java/com/hedera/block/server/notifier/NotifierImplTest.java
index c8b324cfb..37002a4f3 100644
--- a/server/src/test/java/com/hedera/block/server/notifier/NotifierImplTest.java
+++ b/server/src/test/java/com/hedera/block/server/notifier/NotifierImplTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.notifier;
 
 import static com.hedera.block.server.metrics.BlockNodeMetricTypes.Gauge.Producers;
diff --git a/server/src/test/java/com/hedera/block/server/pbj/PbjBlockAccessServiceProxyTest.java b/server/src/test/java/com/hedera/block/server/pbj/PbjBlockAccessServiceProxyTest.java
index c21ee4920..93f532ec3 100644
--- a/server/src/test/java/com/hedera/block/server/pbj/PbjBlockAccessServiceProxyTest.java
+++ b/server/src/test/java/com/hedera/block/server/pbj/PbjBlockAccessServiceProxyTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.pbj;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/server/src/test/java/com/hedera/block/server/pbj/PbjBlockStreamServiceIntegrationTest.java b/server/src/test/java/com/hedera/block/server/pbj/PbjBlockStreamServiceIntegrationTest.java
index 0f7312d69..fd7c45577 100644
--- a/server/src/test/java/com/hedera/block/server/pbj/PbjBlockStreamServiceIntegrationTest.java
+++ b/server/src/test/java/com/hedera/block/server/pbj/PbjBlockStreamServiceIntegrationTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.pbj;
 
 import static com.hedera.block.server.util.PbjProtoTestUtils.buildAck;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/PersistenceInjectionModuleTest.java b/server/src/test/java/com/hedera/block/server/persistence/PersistenceInjectionModuleTest.java
index 73e73b055..46f8a92ce 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/PersistenceInjectionModuleTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/PersistenceInjectionModuleTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/StreamPersistenceHandlerImplTest.java b/server/src/test/java/com/hedera/block/server/persistence/StreamPersistenceHandlerImplTest.java
index 6081e8bdb..89ca3c9ea 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/StreamPersistenceHandlerImplTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/StreamPersistenceHandlerImplTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence;
 
 import static com.hedera.block.server.metrics.BlockNodeMetricTypes.Counter.StreamPersistenceHandlerError;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/PersistenceStorageConfigTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/PersistenceStorageConfigTest.java
index 9818eae70..1e30af144 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/PersistenceStorageConfigTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/PersistenceStorageConfigTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/compression/NoOpCompressionTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/compression/NoOpCompressionTest.java
index 036fb964c..989cda285 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/compression/NoOpCompressionTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/compression/NoOpCompressionTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.compression;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/compression/ZstdCompressionTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/compression/ZstdCompressionTest.java
index 1a532ad17..faa4014db 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/compression/ZstdCompressionTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/compression/ZstdCompressionTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.compression;
 
 import static com.hedera.block.server.util.PersistTestUtils.PERSISTENCE_STORAGE_COMPRESSION_LEVEL;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalDirPathResolverTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalDirPathResolverTest.java
index 42a70bf21..fed2d4faf 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalDirPathResolverTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalDirPathResolverTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.path;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalFilePathResolverTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalFilePathResolverTest.java
index 32d0f0c2f..ef72fcaff 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalFilePathResolverTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/path/BlockAsLocalFilePathResolverTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.path;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/path/NoOpBlockPathResolverTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/path/NoOpBlockPathResolverTest.java
index 4db3abc68..30bf3ee4e 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/path/NoOpBlockPathResolverTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/path/NoOpBlockPathResolverTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.path;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalDirReaderTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalDirReaderTest.java
index e43dffddc..348394413 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalDirReaderTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalDirReaderTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.read;
 
 import static com.hedera.block.server.Constants.BLOCK_FILE_EXTENSION;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalFileReaderTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalFileReaderTest.java
index b94e3025e..5496e8196 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalFileReaderTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/read/BlockAsLocalFileReaderTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.read;
 
 import static com.hedera.block.server.util.PersistTestUtils.PERSISTENCE_STORAGE_LIVE_ROOT_PATH_KEY;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/read/NoOpBlockReaderTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/read/NoOpBlockReaderTest.java
index 403a3f42b..eba4da28c 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/read/NoOpBlockReaderTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/read/NoOpBlockReaderTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.read;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalDirRemoverTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalDirRemoverTest.java
index c4fe51fad..565c5c6af 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalDirRemoverTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalDirRemoverTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.remove;
 
 import static com.hedera.block.server.util.PersistTestUtils.PERSISTENCE_STORAGE_LIVE_ROOT_PATH_KEY;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalFileRemoverTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalFileRemoverTest.java
index 4a03fa8e3..8d78b14ff 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalFileRemoverTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/remove/BlockAsLocalFileRemoverTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.remove;
 
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/remove/NoOpBlockRemoverTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/remove/NoOpBlockRemoverTest.java
index 8e90fbacb..9200b2a96 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/remove/NoOpBlockRemoverTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/remove/NoOpBlockRemoverTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.remove;
 
 import static org.assertj.core.api.Assertions.assertThatNoException;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalDirWriterTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalDirWriterTest.java
index 7e7b15984..9686e6932 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalDirWriterTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalDirWriterTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.write;
 
 import static com.hedera.block.server.persistence.storage.read.BlockAsLocalDirReaderTest.removeBlockReadPerms;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalFileWriterTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalFileWriterTest.java
index 93f30aa6a..3ca80a36c 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalFileWriterTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/write/BlockAsLocalFileWriterTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.write;
 
 import static com.hedera.block.server.util.PersistTestUtils.PERSISTENCE_STORAGE_LIVE_ROOT_PATH_KEY;
diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/write/NoOpBlockWriterTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/write/NoOpBlockWriterTest.java
index a06085edc..ea40953c7 100644
--- a/server/src/test/java/com/hedera/block/server/persistence/storage/write/NoOpBlockWriterTest.java
+++ b/server/src/test/java/com/hedera/block/server/persistence/storage/write/NoOpBlockWriterTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.persistence.storage.write;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/server/src/test/java/com/hedera/block/server/producer/ProducerBlockItemObserverTest.java b/server/src/test/java/com/hedera/block/server/producer/ProducerBlockItemObserverTest.java
index d27889e8e..b62bc83bb 100644
--- a/server/src/test/java/com/hedera/block/server/producer/ProducerBlockItemObserverTest.java
+++ b/server/src/test/java/com/hedera/block/server/producer/ProducerBlockItemObserverTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.producer;
 
 import static com.hedera.block.server.util.PersistTestUtils.generateBlockItemsUnparsed;
diff --git a/server/src/test/java/com/hedera/block/server/service/ServiceConfigTest.java b/server/src/test/java/com/hedera/block/server/service/ServiceConfigTest.java
index c5c26e937..618128b03 100644
--- a/server/src/test/java/com/hedera/block/server/service/ServiceConfigTest.java
+++ b/server/src/test/java/com/hedera/block/server/service/ServiceConfigTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.service;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -30,8 +15,7 @@ public void testServiceConfig_happyPath() {
 
     @Test
     public void testServiceConfig_negativeDelayMillis() {
-        IllegalArgumentException exception =
-                assertThrows(IllegalArgumentException.class, () -> new ServiceConfig(-1));
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> new ServiceConfig(-1));
         assertEquals("Delay milliseconds must be greater than 0", exception.getMessage());
     }
 }
diff --git a/server/src/test/java/com/hedera/block/server/util/PbjProtoTestUtils.java b/server/src/test/java/com/hedera/block/server/util/PbjProtoTestUtils.java
index 33278ce9d..3b0d6e5fb 100644
--- a/server/src/test/java/com/hedera/block/server/util/PbjProtoTestUtils.java
+++ b/server/src/test/java/com/hedera/block/server/util/PbjProtoTestUtils.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.util;
 
 import static com.hedera.block.server.producer.Util.getFakeHash;
diff --git a/server/src/test/java/com/hedera/block/server/util/PersistTestUtils.java b/server/src/test/java/com/hedera/block/server/util/PersistTestUtils.java
index bde470922..a95830662 100644
--- a/server/src/test/java/com/hedera/block/server/util/PersistTestUtils.java
+++ b/server/src/test/java/com/hedera/block/server/util/PersistTestUtils.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.util;
 
 import static java.lang.System.Logger;
diff --git a/server/src/test/java/com/hedera/block/server/util/TestConfigUtil.java b/server/src/test/java/com/hedera/block/server/util/TestConfigUtil.java
index b42e487d4..4913884f6 100644
--- a/server/src/test/java/com/hedera/block/server/util/TestConfigUtil.java
+++ b/server/src/test/java/com/hedera/block/server/util/TestConfigUtil.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.util;
 
 import com.hedera.block.server.config.BlockNodeContext;
diff --git a/server/src/test/java/com/hedera/block/server/util/TestUtils.java b/server/src/test/java/com/hedera/block/server/util/TestUtils.java
index 37159f55c..a8480edd8 100644
--- a/server/src/test/java/com/hedera/block/server/util/TestUtils.java
+++ b/server/src/test/java/com/hedera/block/server/util/TestUtils.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.util;
 
 import java.io.File;
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f90de1505..bba048409 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("com.gradle.enterprise").version("3.15.1")
 }
diff --git a/simulator/build.gradle.kts b/simulator/build.gradle.kts
index a0e5e14bb..fa3008ad6 100644
--- a/simulator/build.gradle.kts
+++ b/simulator/build.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("application")
     id("com.hedera.block.simulator")
diff --git a/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulator.java b/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulator.java
index f0b66e09a..af3bc53e0 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulator.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulator.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator;
 
 import static com.hedera.block.common.constants.StringsConstants.APPLICATION_PROPERTIES;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulatorApp.java b/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulatorApp.java
index 1bfc3d824..bf6f6a5e7 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulatorApp.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulatorApp.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator;
 
 import static com.hedera.block.common.constants.StringsConstants.LOGGING_PROPERTIES;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulatorInjectionComponent.java b/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulatorInjectionComponent.java
index 8e3d9cfef..c2a24ba04 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulatorInjectionComponent.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulatorInjectionComponent.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator;
 
 import com.hedera.block.simulator.config.ConfigInjectionModule;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/Constants.java b/simulator/src/main/java/com/hedera/block/simulator/Constants.java
index e26666033..cee80b4c5 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/Constants.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/Constants.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator;
 
 /** The Constants class defines the constants for the block simulator. */
diff --git a/simulator/src/main/java/com/hedera/block/simulator/config/ConfigInjectionModule.java b/simulator/src/main/java/com/hedera/block/simulator/config/ConfigInjectionModule.java
index 446d301ed..a5165021d 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/config/ConfigInjectionModule.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/config/ConfigInjectionModule.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config;
 
 import com.hedera.block.simulator.config.data.BlockGeneratorConfig;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/config/SimulatorConfigExtension.java b/simulator/src/main/java/com/hedera/block/simulator/config/SimulatorConfigExtension.java
index e26d80d11..8b4e306d9 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/config/SimulatorConfigExtension.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/config/SimulatorConfigExtension.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config;
 
 import com.google.auto.service.AutoService;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/config/SimulatorMappedConfigSourceInitializer.java b/simulator/src/main/java/com/hedera/block/simulator/config/SimulatorMappedConfigSourceInitializer.java
index 92efd0c7f..7fc56f07b 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/config/SimulatorMappedConfigSourceInitializer.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/config/SimulatorMappedConfigSourceInitializer.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config;
 
 import com.swirlds.config.extensions.sources.ConfigMapping;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/config/data/BlockGeneratorConfig.java b/simulator/src/main/java/com/hedera/block/simulator/config/data/BlockGeneratorConfig.java
index 097897597..16737c2a2 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/config/data/BlockGeneratorConfig.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/config/data/BlockGeneratorConfig.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config.data;
 
 import com.hedera.block.simulator.config.types.GenerationMode;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/config/data/BlockStreamConfig.java b/simulator/src/main/java/com/hedera/block/simulator/config/data/BlockStreamConfig.java
index 34aba7c8d..5a29e0b6a 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/config/data/BlockStreamConfig.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/config/data/BlockStreamConfig.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config.data;
 
 import com.hedera.block.simulator.config.types.SimulatorMode;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/config/data/GrpcConfig.java b/simulator/src/main/java/com/hedera/block/simulator/config/data/GrpcConfig.java
index dea9e07d2..fd17595b8 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/config/data/GrpcConfig.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/config/data/GrpcConfig.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config.data;
 
 import com.swirlds.config.api.ConfigData;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/config/data/StreamStatus.java b/simulator/src/main/java/com/hedera/block/simulator/config/data/StreamStatus.java
index 79919a29a..6416dfbd1 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/config/data/StreamStatus.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/config/data/StreamStatus.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config.data;
 
 import static com.hedera.block.common.utils.Preconditions.requireWhole;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/config/types/GenerationMode.java b/simulator/src/main/java/com/hedera/block/simulator/config/types/GenerationMode.java
index cf61bdaab..131f193d9 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/config/types/GenerationMode.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/config/types/GenerationMode.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config.types;
 
 /** The GenerationMode enum defines the modes of generation for the block stream. */
diff --git a/simulator/src/main/java/com/hedera/block/simulator/config/types/SimulatorMode.java b/simulator/src/main/java/com/hedera/block/simulator/config/types/SimulatorMode.java
index 4033bc2e7..454ea44d0 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/config/types/SimulatorMode.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/config/types/SimulatorMode.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config.types;
 
 /** The SimulatorMode enum defines the work modes of the block stream simulator. */
diff --git a/simulator/src/main/java/com/hedera/block/simulator/config/types/StreamingMode.java b/simulator/src/main/java/com/hedera/block/simulator/config/types/StreamingMode.java
index 39ccd46d3..d46aa972e 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/config/types/StreamingMode.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/config/types/StreamingMode.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config.types;
 
 /** The StreamingMode enum defines the different modes for streaming blocks. */
diff --git a/simulator/src/main/java/com/hedera/block/simulator/exception/BlockSimulatorParsingException.java b/simulator/src/main/java/com/hedera/block/simulator/exception/BlockSimulatorParsingException.java
index 701affaf7..8947bd050 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/exception/BlockSimulatorParsingException.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/exception/BlockSimulatorParsingException.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.exception;
 
 /** Use this checked exception to represent a Block Simulator parsing exception. */
diff --git a/simulator/src/main/java/com/hedera/block/simulator/generator/BlockAsDirBlockStreamManager.java b/simulator/src/main/java/com/hedera/block/simulator/generator/BlockAsDirBlockStreamManager.java
index c5a5ab4a3..b4c9fc0be 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/generator/BlockAsDirBlockStreamManager.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/generator/BlockAsDirBlockStreamManager.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.generator;
 
 import static com.hedera.block.simulator.Constants.GZ_EXTENSION;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/generator/BlockAsFileBlockStreamManager.java b/simulator/src/main/java/com/hedera/block/simulator/generator/BlockAsFileBlockStreamManager.java
index cdb9cfd4a..dde028d15 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/generator/BlockAsFileBlockStreamManager.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/generator/BlockAsFileBlockStreamManager.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.generator;
 
 import static com.hedera.block.simulator.Constants.GZ_EXTENSION;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/generator/BlockAsFileLargeDataSets.java b/simulator/src/main/java/com/hedera/block/simulator/generator/BlockAsFileLargeDataSets.java
index 6fd8ef4d3..a74fbcb9d 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/generator/BlockAsFileLargeDataSets.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/generator/BlockAsFileLargeDataSets.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.generator;
 
 import static com.hedera.block.simulator.Constants.GZ_EXTENSION;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/generator/BlockStreamManager.java b/simulator/src/main/java/com/hedera/block/simulator/generator/BlockStreamManager.java
index 2f951d912..76b3e7615 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/generator/BlockStreamManager.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/generator/BlockStreamManager.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.generator;
 
 import com.hedera.block.simulator.config.types.GenerationMode;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/generator/GeneratorInjectionModule.java b/simulator/src/main/java/com/hedera/block/simulator/generator/GeneratorInjectionModule.java
index 68fcdd897..df9aad7e3 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/generator/GeneratorInjectionModule.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/generator/GeneratorInjectionModule.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.generator;
 
 import com.hedera.block.simulator.config.data.BlockGeneratorConfig;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/grpc/ConsumerStreamGrpcClient.java b/simulator/src/main/java/com/hedera/block/simulator/grpc/ConsumerStreamGrpcClient.java
index c403b8716..1bc4c89a2 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/grpc/ConsumerStreamGrpcClient.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/grpc/ConsumerStreamGrpcClient.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.grpc;
 
 import java.util.List;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/grpc/GrpcInjectionModule.java b/simulator/src/main/java/com/hedera/block/simulator/grpc/GrpcInjectionModule.java
index 6ae3ec662..9057bd6aa 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/grpc/GrpcInjectionModule.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/grpc/GrpcInjectionModule.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.grpc;
 
 import com.hedera.block.simulator.grpc.impl.ConsumerStreamGrpcClientImpl;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/grpc/PublishStreamGrpcClient.java b/simulator/src/main/java/com/hedera/block/simulator/grpc/PublishStreamGrpcClient.java
index 0488a5a66..a869f6215 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/grpc/PublishStreamGrpcClient.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/grpc/PublishStreamGrpcClient.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.grpc;
 
 import com.hedera.hapi.block.stream.protoc.Block;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamGrpcClientImpl.java b/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamGrpcClientImpl.java
index ce0ad580a..6b1c8f71a 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamGrpcClientImpl.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamGrpcClientImpl.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.grpc.impl;
 
 import static com.hedera.block.simulator.metrics.SimulatorMetricTypes.Counter.LiveBlocksConsumed;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamObserver.java b/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamObserver.java
index b124dbbbb..4be567fe6 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamObserver.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamObserver.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.grpc.impl;
 
 import static com.hedera.block.simulator.metrics.SimulatorMetricTypes.Counter.LiveBlocksConsumed;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/PublishStreamGrpcClientImpl.java b/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/PublishStreamGrpcClientImpl.java
index c2b4a58a2..e66b3c225 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/PublishStreamGrpcClientImpl.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/PublishStreamGrpcClientImpl.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.grpc.impl;
 
 import static com.hedera.block.simulator.metrics.SimulatorMetricTypes.Counter.LiveBlockItemsSent;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/PublishStreamObserver.java b/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/PublishStreamObserver.java
index 8365983d1..09eb4b444 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/PublishStreamObserver.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/grpc/impl/PublishStreamObserver.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.grpc.impl;
 
 import static java.lang.System.Logger.Level.ERROR;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/metrics/MetricsInjectionModule.java b/simulator/src/main/java/com/hedera/block/simulator/metrics/MetricsInjectionModule.java
index 2751c04f3..924ed129f 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/metrics/MetricsInjectionModule.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/metrics/MetricsInjectionModule.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.metrics;
 
 import com.swirlds.common.metrics.platform.DefaultMetricsProvider;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/metrics/MetricsService.java b/simulator/src/main/java/com/hedera/block/simulator/metrics/MetricsService.java
index 959d42209..8c173a4c3 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/metrics/MetricsService.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/metrics/MetricsService.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.metrics;
 
 import com.swirlds.metrics.api.Counter;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/metrics/MetricsServiceImpl.java b/simulator/src/main/java/com/hedera/block/simulator/metrics/MetricsServiceImpl.java
index 9b8b7ee61..74bb87878 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/metrics/MetricsServiceImpl.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/metrics/MetricsServiceImpl.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.metrics;
 
 import com.swirlds.metrics.api.Counter;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/metrics/SimulatorMetricTypes.java b/simulator/src/main/java/com/hedera/block/simulator/metrics/SimulatorMetricTypes.java
index 821acacb8..37f6091ce 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/metrics/SimulatorMetricTypes.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/metrics/SimulatorMetricTypes.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.metrics;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/mode/CombinedModeHandler.java b/simulator/src/main/java/com/hedera/block/simulator/mode/CombinedModeHandler.java
index 3b918718c..37beb2e70 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/mode/CombinedModeHandler.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/mode/CombinedModeHandler.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.mode;
 
 import com.hedera.block.simulator.config.data.BlockStreamConfig;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/mode/ConsumerModeHandler.java b/simulator/src/main/java/com/hedera/block/simulator/mode/ConsumerModeHandler.java
index feac24e8e..efca1a851 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/mode/ConsumerModeHandler.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/mode/ConsumerModeHandler.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.mode;
 
 import static java.lang.System.Logger.Level.INFO;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/mode/PublisherModeHandler.java b/simulator/src/main/java/com/hedera/block/simulator/mode/PublisherModeHandler.java
index 537e32b08..dd1c94a50 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/mode/PublisherModeHandler.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/mode/PublisherModeHandler.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.mode;
 
 import static com.hedera.block.simulator.Constants.NANOS_PER_MILLI;
diff --git a/simulator/src/main/java/com/hedera/block/simulator/mode/SimulatorModeHandler.java b/simulator/src/main/java/com/hedera/block/simulator/mode/SimulatorModeHandler.java
index 4be5c99b2..1f42078a6 100644
--- a/simulator/src/main/java/com/hedera/block/simulator/mode/SimulatorModeHandler.java
+++ b/simulator/src/main/java/com/hedera/block/simulator/mode/SimulatorModeHandler.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.mode;
 
 import com.hedera.block.simulator.exception.BlockSimulatorParsingException;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/BlockStreamSimulatorTest.java b/simulator/src/test/java/com/hedera/block/simulator/BlockStreamSimulatorTest.java
index 8617f6eb9..336c373cd 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/BlockStreamSimulatorTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/BlockStreamSimulatorTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator;
 
 import static com.hedera.block.simulator.TestUtils.getTestMetrics;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/TestUtils.java b/simulator/src/test/java/com/hedera/block/simulator/TestUtils.java
index 60a163913..020b4948d 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/TestUtils.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/TestUtils.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator;
 
 import com.hedera.block.simulator.config.TestConfigBuilder;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/config/ConfigInjectionModuleTest.java b/simulator/src/test/java/com/hedera/block/simulator/config/ConfigInjectionModuleTest.java
index 255fe1c93..ae4a92dd9 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/config/ConfigInjectionModuleTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/config/ConfigInjectionModuleTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/config/SimulatorMappedConfigSourceInitializerTest.java b/simulator/src/test/java/com/hedera/block/simulator/config/SimulatorMappedConfigSourceInitializerTest.java
index cde5199aa..3e58c7ed1 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/config/SimulatorMappedConfigSourceInitializerTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/config/SimulatorMappedConfigSourceInitializerTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/config/TestConfigBuilder.java b/simulator/src/test/java/com/hedera/block/simulator/config/TestConfigBuilder.java
index fad02a684..8c167cfd6 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/config/TestConfigBuilder.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/config/TestConfigBuilder.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config;
 
 import com.swirlds.common.config.singleton.ConfigurationHolder;
@@ -90,8 +75,7 @@ public TestConfigBuilder(final boolean registerAllTypes) {
      * @return the {@link TestConfigBuilder} instance (for fluent API)
      */
     @NonNull
-    public TestConfigBuilder withValue(
-            @NonNull final String propertyName, @Nullable final String value) {
+    public TestConfigBuilder withValue(@NonNull final String propertyName, @Nullable final String value) {
         return withSource(new SimpleConfigSource(propertyName, value));
     }
 
@@ -151,8 +135,7 @@ public TestConfigBuilder withValue(@NonNull final String propertyName, final boo
      * @return the {@link TestConfigBuilder} instance (for fluent API)
      */
     @NonNull
-    public TestConfigBuilder withValue(
-            @NonNull final String propertyName, @NonNull final Object value) {
+    public TestConfigBuilder withValue(@NonNull final String propertyName, @NonNull final Object value) {
         Objects.requireNonNull(value, "value must not be null");
         return withSource(new SimpleConfigSource(propertyName, value.toString()));
     }
diff --git a/simulator/src/test/java/com/hedera/block/simulator/config/data/BlockStreamConfigTest.java b/simulator/src/test/java/com/hedera/block/simulator/config/data/BlockStreamConfigTest.java
index 19afb332d..93b9097ae 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/config/data/BlockStreamConfigTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/config/data/BlockStreamConfigTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config.data;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/config/data/StreamStatusTest.java b/simulator/src/test/java/com/hedera/block/simulator/config/data/StreamStatusTest.java
index d9f311f5b..35f5b2ffb 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/config/data/StreamStatusTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/config/data/StreamStatusTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config.data;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/config/types/GenerationModeTest.java b/simulator/src/test/java/com/hedera/block/simulator/config/types/GenerationModeTest.java
index 1a4448ffd..ae73fd93b 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/config/types/GenerationModeTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/config/types/GenerationModeTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config.types;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/config/types/StreamingModeTest.java b/simulator/src/test/java/com/hedera/block/simulator/config/types/StreamingModeTest.java
index ca723e515..9bd21e689 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/config/types/StreamingModeTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/config/types/StreamingModeTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.config.types;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/generator/BlockAsDirBlockStreamManagerTest.java b/simulator/src/test/java/com/hedera/block/simulator/generator/BlockAsDirBlockStreamManagerTest.java
index 430a2795b..42d870d6f 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/generator/BlockAsDirBlockStreamManagerTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/generator/BlockAsDirBlockStreamManagerTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.generator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/generator/BlockAsFileBlockStreamManagerTest.java b/simulator/src/test/java/com/hedera/block/simulator/generator/BlockAsFileBlockStreamManagerTest.java
index 685e2b234..255d7c813 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/generator/BlockAsFileBlockStreamManagerTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/generator/BlockAsFileBlockStreamManagerTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.generator;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/generator/BlockAsFileLargeDataSetsTest.java b/simulator/src/test/java/com/hedera/block/simulator/generator/BlockAsFileLargeDataSetsTest.java
index f7083cbd2..69ccf13cc 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/generator/BlockAsFileLargeDataSetsTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/generator/BlockAsFileLargeDataSetsTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.generator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/generator/GeneratorInjectionModuleTest.java b/simulator/src/test/java/com/hedera/block/simulator/generator/GeneratorInjectionModuleTest.java
index 65022ed75..51d203930 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/generator/GeneratorInjectionModuleTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/generator/GeneratorInjectionModuleTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.generator;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -29,47 +14,36 @@ class GeneratorInjectionModuleTest {
     @Test
     void providesBlockStreamManager_AsFileLargeDataSets() throws IOException {
 
-        BlockGeneratorConfig blockGeneratorConfig =
-                TestUtils.getTestConfiguration(
-                                Map.of(
-                                        "generator.managerImplementation",
-                                        "BlockAsFileLargeDataSets"))
-                        .getConfigData(BlockGeneratorConfig.class);
+        BlockGeneratorConfig blockGeneratorConfig = TestUtils.getTestConfiguration(
+                        Map.of("generator.managerImplementation", "BlockAsFileLargeDataSets"))
+                .getConfigData(BlockGeneratorConfig.class);
 
         BlockStreamManager blockStreamManager =
                 GeneratorInjectionModule.providesBlockStreamManager(blockGeneratorConfig);
 
-        assertEquals(
-                blockStreamManager.getClass().getName(), BlockAsFileLargeDataSets.class.getName());
+        assertEquals(blockStreamManager.getClass().getName(), BlockAsFileLargeDataSets.class.getName());
     }
 
     @Test
     void providesBlockStreamManager_AsFile() throws IOException {
-        BlockGeneratorConfig blockGeneratorConfig =
-                TestUtils.getTestConfiguration(
-                                Map.of(
-                                        "generator.managerImplementation",
-                                        "BlockAsFileBlockStreamManager",
-                                        "generator.folderRootPath",
-                                        ""))
-                        .getConfigData(BlockGeneratorConfig.class);
+        BlockGeneratorConfig blockGeneratorConfig = TestUtils.getTestConfiguration(Map.of(
+                        "generator.managerImplementation",
+                        "BlockAsFileBlockStreamManager",
+                        "generator.folderRootPath",
+                        ""))
+                .getConfigData(BlockGeneratorConfig.class);
 
         BlockStreamManager blockStreamManager =
                 GeneratorInjectionModule.providesBlockStreamManager(blockGeneratorConfig);
 
-        assertEquals(
-                blockStreamManager.getClass().getName(),
-                BlockAsFileBlockStreamManager.class.getName());
+        assertEquals(blockStreamManager.getClass().getName(), BlockAsFileBlockStreamManager.class.getName());
     }
 
     @Test
     void providesBlockStreamManager_AsDir() throws IOException {
-        BlockGeneratorConfig blockGeneratorConfig =
-                TestUtils.getTestConfiguration(
-                                Map.of(
-                                        "generator.managerImplementation",
-                                        "BlockAsDirBlockStreamManager"))
-                        .getConfigData(BlockGeneratorConfig.class);
+        BlockGeneratorConfig blockGeneratorConfig = TestUtils.getTestConfiguration(
+                        Map.of("generator.managerImplementation", "BlockAsDirBlockStreamManager"))
+                .getConfigData(BlockGeneratorConfig.class);
 
         BlockStreamManager blockStreamManager =
                 GeneratorInjectionModule.providesBlockStreamManager(blockGeneratorConfig);
@@ -81,20 +55,13 @@ void providesBlockStreamManager_AsDir() throws IOException {
 
     @Test
     void providesBlockStreamManager_default() throws IOException {
-        BlockGeneratorConfig blockGeneratorConfig =
-                TestUtils.getTestConfiguration(
-                                Map.of(
-                                        "generator.managerImplementation",
-                                        "",
-                                        "generator.folderRootPath",
-                                        ""))
-                        .getConfigData(BlockGeneratorConfig.class);
+        BlockGeneratorConfig blockGeneratorConfig = TestUtils.getTestConfiguration(
+                        Map.of("generator.managerImplementation", "", "generator.folderRootPath", ""))
+                .getConfigData(BlockGeneratorConfig.class);
 
         BlockStreamManager blockStreamManager =
                 GeneratorInjectionModule.providesBlockStreamManager(blockGeneratorConfig);
 
-        assertEquals(
-                blockStreamManager.getClass().getName(),
-                BlockAsFileBlockStreamManager.class.getName());
+        assertEquals(blockStreamManager.getClass().getName(), BlockAsFileBlockStreamManager.class.getName());
     }
 }
diff --git a/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamGrpcClientImplTest.java b/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamGrpcClientImplTest.java
index 316b26fa8..59858f17b 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamGrpcClientImplTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamGrpcClientImplTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.grpc.impl;
 
 import static com.hedera.block.simulator.TestUtils.findFreePort;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamObserverTest.java b/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamObserverTest.java
index 4f8ed18da..474e11472 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamObserverTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/ConsumerStreamObserverTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.grpc.impl;
 
 import static com.hedera.block.simulator.TestUtils.getTestMetrics;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/PublishStreamGrpcClientImplTest.java b/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/PublishStreamGrpcClientImplTest.java
index fa98846c6..4dc14bb7f 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/PublishStreamGrpcClientImplTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/PublishStreamGrpcClientImplTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.grpc.impl;
 
 import static com.hedera.block.simulator.TestUtils.findFreePort;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/PublishStreamObserverTest.java b/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/PublishStreamObserverTest.java
index 37c82a8d6..c7d973f0b 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/PublishStreamObserverTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/grpc/impl/PublishStreamObserverTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.grpc.impl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/metrics/MetricsInjectionModuleTest.java b/simulator/src/test/java/com/hedera/block/simulator/metrics/MetricsInjectionModuleTest.java
index ac3a099cf..a20c513b3 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/metrics/MetricsInjectionModuleTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/metrics/MetricsInjectionModuleTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.metrics;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/metrics/MetricsServiceTest.java b/simulator/src/test/java/com/hedera/block/simulator/metrics/MetricsServiceTest.java
index a14804e5b..a5ed2454d 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/metrics/MetricsServiceTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/metrics/MetricsServiceTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.metrics;
 
 import static com.hedera.block.simulator.TestUtils.getTestMetrics;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/mode/CombinedModeHandlerTest.java b/simulator/src/test/java/com/hedera/block/simulator/mode/CombinedModeHandlerTest.java
index b4ed067a4..a33e779d7 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/mode/CombinedModeHandlerTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/mode/CombinedModeHandlerTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.mode;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/mode/ConsumerModeHandlerTest.java b/simulator/src/test/java/com/hedera/block/simulator/mode/ConsumerModeHandlerTest.java
index 017e5cd1e..423d8d972 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/mode/ConsumerModeHandlerTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/mode/ConsumerModeHandlerTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.mode;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/simulator/src/test/java/com/hedera/block/simulator/mode/PublisherModeHandlerTest.java b/simulator/src/test/java/com/hedera/block/simulator/mode/PublisherModeHandlerTest.java
index 3c600535f..df1d2057f 100644
--- a/simulator/src/test/java/com/hedera/block/simulator/mode/PublisherModeHandlerTest.java
+++ b/simulator/src/test/java/com/hedera/block/simulator/mode/PublisherModeHandlerTest.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.simulator.mode;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/stream/build.gradle.kts b/stream/build.gradle.kts
index 20a1bdfab..6d0fe81f0 100644
--- a/stream/build.gradle.kts
+++ b/stream/build.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("com.hedera.block.protobuf")
     alias(libs.plugins.pbj)
diff --git a/suites/build.gradle.kts b/suites/build.gradle.kts
index 85af453d4..df93c7d23 100644
--- a/suites/build.gradle.kts
+++ b/suites/build.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("application")
     id("com.hedera.block.suites")
diff --git a/suites/src/main/java/com/hedera/block/suites/BaseSuite.java b/suites/src/main/java/com/hedera/block/suites/BaseSuite.java
index 9631a7d54..c8bc30303 100644
--- a/suites/src/main/java/com/hedera/block/suites/BaseSuite.java
+++ b/suites/src/main/java/com/hedera/block/suites/BaseSuite.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.suites;
 
 import com.hedera.block.simulator.BlockStreamSimulatorApp;
diff --git a/suites/src/main/java/com/hedera/block/suites/ErrorLoggingExecutor.java b/suites/src/main/java/com/hedera/block/suites/ErrorLoggingExecutor.java
index e89527cae..879338133 100644
--- a/suites/src/main/java/com/hedera/block/suites/ErrorLoggingExecutor.java
+++ b/suites/src/main/java/com/hedera/block/suites/ErrorLoggingExecutor.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.suites;
 
 import static java.lang.System.Logger.Level.ERROR;
diff --git a/suites/src/main/java/com/hedera/block/suites/grpc/GrpcTestSuites.java b/suites/src/main/java/com/hedera/block/suites/grpc/GrpcTestSuites.java
index e7175edd8..de006f921 100644
--- a/suites/src/main/java/com/hedera/block/suites/grpc/GrpcTestSuites.java
+++ b/suites/src/main/java/com/hedera/block/suites/grpc/GrpcTestSuites.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.suites.grpc;
 
 import com.hedera.block.suites.grpc.negative.NegativeServerAvailabilityTests;
diff --git a/suites/src/main/java/com/hedera/block/suites/grpc/negative/NegativeServerAvailabilityTests.java b/suites/src/main/java/com/hedera/block/suites/grpc/negative/NegativeServerAvailabilityTests.java
index cc93fc5bc..bdbcdd642 100644
--- a/suites/src/main/java/com/hedera/block/suites/grpc/negative/NegativeServerAvailabilityTests.java
+++ b/suites/src/main/java/com/hedera/block/suites/grpc/negative/NegativeServerAvailabilityTests.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.suites.grpc.negative;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/suites/src/main/java/com/hedera/block/suites/grpc/positive/PositiveEndpointBehaviourTests.java b/suites/src/main/java/com/hedera/block/suites/grpc/positive/PositiveEndpointBehaviourTests.java
index de8e3194f..12a4e5d4f 100644
--- a/suites/src/main/java/com/hedera/block/suites/grpc/positive/PositiveEndpointBehaviourTests.java
+++ b/suites/src/main/java/com/hedera/block/suites/grpc/positive/PositiveEndpointBehaviourTests.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.suites.grpc.positive;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/suites/src/main/java/com/hedera/block/suites/grpc/positive/PositiveServerAvailabilityTests.java b/suites/src/main/java/com/hedera/block/suites/grpc/positive/PositiveServerAvailabilityTests.java
index 480fc0807..352c34939 100644
--- a/suites/src/main/java/com/hedera/block/suites/grpc/positive/PositiveServerAvailabilityTests.java
+++ b/suites/src/main/java/com/hedera/block/suites/grpc/positive/PositiveServerAvailabilityTests.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.suites.grpc.positive;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/suites/src/main/java/com/hedera/block/suites/persistence/DataPersistenceTestSuites.java b/suites/src/main/java/com/hedera/block/suites/persistence/DataPersistenceTestSuites.java
index 283d98549..7e65b7ada 100644
--- a/suites/src/main/java/com/hedera/block/suites/persistence/DataPersistenceTestSuites.java
+++ b/suites/src/main/java/com/hedera/block/suites/persistence/DataPersistenceTestSuites.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.suites.persistence;
 
 import com.hedera.block.suites.persistence.positive.PositiveDataPersistenceTests;
diff --git a/suites/src/main/java/com/hedera/block/suites/persistence/positive/PositiveDataPersistenceTests.java b/suites/src/main/java/com/hedera/block/suites/persistence/positive/PositiveDataPersistenceTests.java
index 324916d20..c5f5b44d4 100644
--- a/suites/src/main/java/com/hedera/block/suites/persistence/positive/PositiveDataPersistenceTests.java
+++ b/suites/src/main/java/com/hedera/block/suites/persistence/positive/PositiveDataPersistenceTests.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.suites.persistence.positive;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/tool.sh b/tool.sh
index 251ec9dc7..6aa002370 100755
--- a/tool.sh
+++ b/tool.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: Apache-2.0
 # run gradle jar build and send output to /dev/null
 ./gradlew -q tool:shadowJar > /dev/null
 # check if last command failed and exit if so
diff --git a/tools/build.gradle.kts b/tools/build.gradle.kts
index 946169635..476cb2e38 100644
--- a/tools/build.gradle.kts
+++ b/tools/build.gradle.kts
@@ -1,39 +1,8 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import com.github.jengelman.gradle.plugins.shadow.internal.DefaultDependencyFilter
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradlex.javamodule.dependencies.tasks.ModuleDirectivesScopeCheck
 
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 plugins {
     id("application")
     id("com.hedera.block.tools")
diff --git a/tools/src/main/java/com/hedera/block/tools/BlockStreamTool.java b/tools/src/main/java/com/hedera/block/tools/BlockStreamTool.java
index 347de415a..0c79430da 100644
--- a/tools/src/main/java/com/hedera/block/tools/BlockStreamTool.java
+++ b/tools/src/main/java/com/hedera/block/tools/BlockStreamTool.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools;
 
 import com.hedera.block.tools.commands.BlockInfo;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/BlockInfo.java b/tools/src/main/java/com/hedera/block/tools/commands/BlockInfo.java
index 446a99246..9fc7a23e0 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/BlockInfo.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/BlockInfo.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands;
 
 import com.hedera.hapi.block.stream.Block;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/ConvertToJson.java b/tools/src/main/java/com/hedera/block/tools/commands/ConvertToJson.java
index 70a2565ad..2b5638d03 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/ConvertToJson.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/ConvertToJson.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands;
 
 import com.hedera.hapi.block.stream.Block;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/Record2BlockCommand.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/Record2BlockCommand.java
index 58767a836..703d23498 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/Record2BlockCommand.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/Record2BlockCommand.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks;
 
 import static com.hedera.block.tools.commands.record2blocks.mirrornode.FetchBlockQuery.getPreviousHashForBlock;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/gcp/AddNewerBlockTimes.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/gcp/AddNewerBlockTimes.java
index a9523821e..a6c16ba06 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/gcp/AddNewerBlockTimes.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/gcp/AddNewerBlockTimes.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.gcp;
 
 import static com.hedera.block.tools.commands.record2blocks.util.RecordFileDates.blockTimeLongToInstant;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/gcp/MainNetBucket.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/gcp/MainNetBucket.java
index d4731905d..b74cd16d8 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/gcp/MainNetBucket.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/gcp/MainNetBucket.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.gcp;
 
 import com.google.cloud.storage.BlobInfo;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/ExtractBlockTimes.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/ExtractBlockTimes.java
index 3d0316a8b..aa9321f37 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/ExtractBlockTimes.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/ExtractBlockTimes.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.mirrornode;
 
 import static com.hedera.block.tools.commands.record2blocks.util.RecordFileDates.recordFileNameToBlockTimeLong;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/FetchBlockQuery.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/FetchBlockQuery.java
index 23ac92f9e..812467202 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/FetchBlockQuery.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/FetchBlockQuery.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.mirrornode;
 
 import com.google.gson.Gson;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/FetchMirrorNodeRecordsCsv.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/FetchMirrorNodeRecordsCsv.java
index 9a64b556b..5906f34d0 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/FetchMirrorNodeRecordsCsv.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/FetchMirrorNodeRecordsCsv.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.mirrornode;
 
 import com.google.auth.oauth2.GoogleCredentials;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/ValidateBlockTimes.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/ValidateBlockTimes.java
index e10b28c6f..20bdc7e06 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/ValidateBlockTimes.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/mirrornode/ValidateBlockTimes.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.mirrornode;
 
 import static com.hedera.block.tools.commands.record2blocks.util.RecordFileDates.blockTimeLongToRecordFilePrefix;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/BlockInfo.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/BlockInfo.java
index b0a28a653..7d6229191 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/BlockInfo.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/BlockInfo.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.model;
 
 import com.hedera.block.tools.commands.record2blocks.model.ChainFile.Kind;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/BlockTimes.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/BlockTimes.java
index b35410f1e..54d47bb78 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/BlockTimes.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/BlockTimes.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.model;
 
 import java.nio.ByteBuffer;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/ChainFile.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/ChainFile.java
index 3849a04c3..5b8c30b2f 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/ChainFile.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/ChainFile.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.model;
 
 import static com.hedera.block.tools.commands.record2blocks.util.RecordFileDates.blockTimeInstantToLong;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/ChainFileAndCount.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/ChainFileAndCount.java
index 46cb67d09..6c9ad776a 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/ChainFileAndCount.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/ChainFileAndCount.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.model;
 
 /**
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/NumberedSidecarFile.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/NumberedSidecarFile.java
index 9e26b1e63..6223701a1 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/NumberedSidecarFile.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/NumberedSidecarFile.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.model;
 
 import java.util.List;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/ParsedSignatureFile.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/ParsedSignatureFile.java
index 4ee1dd9ae..5587f5b40 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/ParsedSignatureFile.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/ParsedSignatureFile.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.model;
 
 import com.hedera.block.tools.commands.record2blocks.gcp.MainNetBucket;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/RecordFileInfo.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/RecordFileInfo.java
index a5b7c3d76..cf53e3aff 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/RecordFileInfo.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/model/RecordFileInfo.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.model;
 
 import static com.hedera.block.tools.commands.record2blocks.model.ParsedSignatureFile.HASH_OBJECT_SIZE_BYTES;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/util/BlockWriter.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/util/BlockWriter.java
index ba3814a8e..8296fb06d 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/util/BlockWriter.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/util/BlockWriter.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.util;
 
 import com.github.luben.zstd.ZstdOutputStream;
diff --git a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/util/RecordFileDates.java b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/util/RecordFileDates.java
index c27de0f46..9ae375a3e 100644
--- a/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/util/RecordFileDates.java
+++ b/tools/src/main/java/com/hedera/block/tools/commands/record2blocks/util/RecordFileDates.java
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.tools.commands.record2blocks.util;
 
 import java.time.Duration;