From 1f47b319f98d5423dd70c23844c61e25086a0e2e Mon Sep 17 00:00:00 2001 From: "Mark S. Lewis" Date: Tue, 22 Oct 2024 19:30:04 +0100 Subject: [PATCH] Use Spotless for code formatting Spotless is widely used opinionated Java code formatter. It will also fix incorrect formatting using `./gradlew spotlessApply`, avoiding the need for contributors to manually correct any formatting violations flagged by Checkstyle. Formatting rules defined by Checkstyle that would otherwise cause conflicts with the formatting applied by Spotless are removed. This change also: - Fixes one deprecation warning in OpenTelementryTracesProvider. - Updates the Gradle wrapper version to 8.10.2. - Uses Java 17 in the build, since support for running Gradle with earlier Java versions is now deprecated with plans to remove support in Gradle v9. Signed-off-by: Mark S. Lewis --- .github/workflows/release.yml | 4 +- .github/workflows/scan.yml | 2 +- .github/workflows/test.yml | 6 +- .gitignore | 1 + CONTRIBUTING.md | 2 +- build.gradle | 23 +- ci/checkstyle/checkstyle.xml | 17 - fabric-chaincode-docker/build.gradle | 1 - .../build.gradle | 4 +- .../chaincodebootstrap.gradle | 2 +- .../contractinstall/ContractInstallTest.java | 29 +- .../ledgertests/LedgerIntegrationTest.java | 21 +- .../shimtests/SACCIntegrationTest.java | 22 +- .../shimtests/SBECCIntegrationTest.java | 13 +- .../fabric/shim/integration/util/Bash.java | 32 +- .../fabric/shim/integration/util/Command.java | 31 +- .../fabric/shim/integration/util/Docker.java | 46 +- .../shim/integration/util/DockerCompose.java | 47 +- .../shim/integration/util/FabricState.java | 12 +- .../shim/integration/util/InvokeHelper.java | 36 +- .../fabric/shim/integration/util/Peer.java | 63 +- fabric-chaincode-shim/build.gradle | 15 +- .../java/org/hyperledger/fabric/Logger.java | 22 +- .../java/org/hyperledger/fabric/Logging.java | 69 +- .../fabric/contract/ClientIdentity.java | 61 +- .../hyperledger/fabric/contract/Context.java | 37 +- .../fabric/contract/ContextFactory.java | 12 +- .../fabric/contract/ContractInterface.java | 85 +-- .../fabric/contract/ContractRouter.java | 26 +- .../contract/ContractRuntimeException.java | 24 +- .../fabric/contract/annotation/Contact.java | 18 +- .../fabric/contract/annotation/Contract.java | 22 +- .../fabric/contract/annotation/DataType.java | 21 +- .../fabric/contract/annotation/Default.java | 8 +- .../fabric/contract/annotation/Info.java | 26 +- .../fabric/contract/annotation/License.java | 16 +- .../fabric/contract/annotation/Property.java | 12 +- .../contract/annotation/Serializer.java | 24 +- .../contract/annotation/Transaction.java | 42 +- .../contract/execution/ExecutionFactory.java | 4 +- .../contract/execution/ExecutionService.java | 4 +- .../contract/execution/InvocationRequest.java | 24 +- .../execution/JSONTransactionSerializer.java | 156 +++-- .../execution/SerializerInterface.java | 16 +- .../impl/ContractExecutionService.java | 35 +- .../impl/ContractInvocationRequest.java | 29 +- .../contract/execution/impl/package-info.java | 4 +- .../contract/execution/package-info.java | 4 +- .../contract/metadata/MetadataBuilder.java | 34 +- .../fabric/contract/metadata/TypeSchema.java | 187 +++--- .../contract/metadata/package-info.java | 4 +- .../fabric/contract/package-info.java | 11 +- .../contract/routing/ContractDefinition.java | 45 +- .../contract/routing/DataTypeDefinition.java | 21 +- .../contract/routing/ParameterDefinition.java | 18 +- .../contract/routing/PropertyDefinition.java | 18 +- .../contract/routing/RoutingRegistry.java | 2 - .../contract/routing/TransactionType.java | 26 +- .../fabric/contract/routing/TxFunction.java | 53 +- .../fabric/contract/routing/TypeRegistry.java | 18 +- .../routing/impl/ContractDefinitionImpl.java | 13 +- .../routing/impl/DataTypeDefinitionImpl.java | 38 +- .../routing/impl/ParameterDefinitionImpl.java | 5 +- .../routing/impl/PropertyDefinitionImpl.java | 3 - .../routing/impl/RoutingRegistryImpl.java | 26 +- .../routing/impl/SerializerRegistryImpl.java | 29 +- .../contract/routing/impl/TxFunctionImpl.java | 31 +- .../routing/impl/TypeRegistryImpl.java | 7 +- .../contract/routing/impl/package-info.java | 4 +- .../fabric/contract/routing/package-info.java | 4 +- .../systemcontract/SystemContract.java | 22 +- .../contract/systemcontract/package-info.java | 4 +- .../hyperledger/fabric/ledger/Collection.java | 8 +- .../org/hyperledger/fabric/ledger/Ledger.java | 36 +- .../fabric/ledger/impl/CollectionImpl.java | 7 +- .../fabric/ledger/impl/LedgerImpl.java | 1 - .../fabric/ledger/impl/package-info.java | 12 +- .../fabric/ledger/package-info.java | 6 +- .../hyperledger/fabric/metrics/Metrics.java | 31 +- .../fabric/metrics/MetricsProvider.java | 30 +- .../fabric/metrics/TaskMetricsCollector.java | 6 +- .../fabric/metrics/impl/DefaultProvider.java | 45 +- .../fabric/metrics/impl/NullProvider.java | 14 +- .../fabric/metrics/impl/package-info.java | 4 +- .../fabric/metrics/package-info.java | 26 +- .../org/hyperledger/fabric/package-info.java | 4 +- .../hyperledger/fabric/shim/Chaincode.java | 44 +- .../fabric/shim/ChaincodeBase.java | 156 ++--- .../fabric/shim/ChaincodeException.java | 52 +- .../fabric/shim/ChaincodeServer.java | 9 +- .../shim/ChaincodeServerProperties.java | 93 ++- .../fabric/shim/ChaincodeStub.java | 616 ++++++++---------- .../fabric/shim/ChatChaincodeWithPeer.java | 12 +- .../hyperledger/fabric/shim/GrpcServer.java | 8 +- .../fabric/shim/NettyChaincodeServer.java | 14 +- .../fabric/shim/NettyGrpcServer.java | 52 +- .../fabric/shim/ResponseUtils.java | 13 +- .../shim/ext/sbe/StateBasedEndorsement.java | 39 +- .../impl/StateBasedEndorsementFactory.java | 13 +- .../sbe/impl/StateBasedEndorsementImpl.java | 31 +- .../sbe/impl/StateBasedEndorsementUtils.java | 39 +- .../shim/ext/sbe/impl/package-info.java | 12 +- .../fabric/shim/ext/sbe/package-info.java | 4 +- .../shim/impl/ChaincodeInvocationTask.java | 89 ++- .../shim/impl/ChaincodeMessageFactory.java | 186 ++++-- .../shim/impl/ChaincodeSupportClient.java | 25 +- .../fabric/shim/impl/InvocationStubImpl.java | 316 +++++---- .../shim/impl/InvocationTaskExecutor.java | 20 +- .../shim/impl/InvocationTaskManager.java | 80 +-- .../fabric/shim/impl/KeyModificationImpl.java | 8 +- .../fabric/shim/impl/KeyValueImpl.java | 4 +- .../shim/impl/QueryResultsIteratorImpl.java | 36 +- .../QueryResultsIteratorWithMetadataImpl.java | 25 +- .../fabric/shim/impl/package-info.java | 4 +- .../fabric/shim/ledger/CompositeKey.java | 28 +- .../ledger/CompositeKeyFormatException.java | 8 +- .../fabric/shim/ledger/KeyModification.java | 8 +- .../fabric/shim/ledger/KeyValue.java | 5 +- .../shim/ledger/QueryResultsIterator.java | 7 +- .../QueryResultsIteratorWithMetadata.java | 11 +- .../fabric/shim/ledger/package-info.java | 1 - .../hyperledger/fabric/shim/package-info.java | 6 +- .../org/hyperledger/fabric/traces/Traces.java | 33 +- .../fabric/traces/TracesProvider.java | 32 +- .../traces/impl/DefaultTracesProvider.java | 3 +- .../fabric/traces/impl/NullProvider.java | 3 +- .../traces/impl/OpenTelemetryProperties.java | 55 +- .../impl/OpenTelemetryTracesProvider.java | 10 +- .../fabric/traces/impl/package-info.java | 12 +- .../fabric/traces/package-info.java | 22 +- .../java/ChaincodeWithoutPackageTest.java | 18 +- .../src/test/java/contract/Greeting.java | 2 - .../test/java/contract/SampleContract.java | 27 +- .../org/hyperledger/fabric/LoggerTest.java | 1 - .../org/hyperledger/fabric/LoggingTest.java | 17 +- .../java/org/hyperledger/fabric/TestUtil.java | 76 ++- .../fabric/contract/AllTypesAsset.java | 13 +- .../contract/ChaincodeStubNaiveImpl.java | 58 +- .../fabric/contract/ClientIdentityTest.java | 78 ++- .../fabric/contract/ContextFactoryTest.java | 21 +- .../fabric/contract/ContextTest.java | 15 +- .../contract/ContractInterfaceTest.java | 22 +- .../fabric/contract/ContractRouterTest.java | 91 ++- .../hyperledger/fabric/contract/MyType.java | 4 +- .../hyperledger/fabric/contract/MyType2.java | 16 +- .../contract/TransactionExceptionTest.java | 11 +- .../ContractExecutionServiceTest.java | 39 +- .../JSONTransactionSerializerTest.java | 9 +- .../metadata/MetadataBuilderTest.java | 30 +- .../contract/metadata/TypeSchemaTest.java | 11 +- .../routing/ContractDefinitionTest.java | 19 +- .../routing/DataTypeDefinitionTest.java | 13 +- .../routing/ParameterDefinitionTest.java | 12 +- .../routing/PropertyDefinitionTest.java | 9 +- .../contract/routing/TxFunctionTest.java | 36 +- .../contract/routing/TypeRegistryTest.java | 10 +- .../simplepath/ContractSimplePathTest.java | 20 +- .../hyperledger/fabric/ledger/LedgerTest.java | 1 - .../fabric/metrics/MetricsTest.java | 24 +- .../metrics/impl/DefaultProviderTest.java | 6 +- .../fabric/shim/ChaincodeBaseTest.java | 138 ++-- .../fabric/shim/ChaincodeServerImplTest.java | 31 +- .../fabric/shim/ChaincodeStubTest.java | 30 +- .../fabric/shim/ChaincodeTest.java | 37 +- .../shim/ChatChaincodeWithPeerTest.java | 226 +++---- .../fabric/shim/NettyGrpcServerTest.java | 229 ++++--- .../ext/sbe/StateBasedEndorsementTest.java | 11 +- .../StateBasedEndorsementFactoryTest.java | 3 +- .../impl/StateBasedEndorsementImplTest.java | 38 +- .../fabric/shim/fvt/ChaincodeFVTest.java | 237 ++++--- .../impl/ChaincodeMessageFactoryTest.java | 9 +- .../shim/impl/ChaincodeSupportClientTest.java | 64 +- .../shim/impl/InnvocationTaskManagerTest.java | 68 +- .../shim/impl/InvocationStubImplTest.java | 15 +- .../shim/impl/InvocationTaskManagerTest.java | 38 +- .../shim/impl/KeyModificationImplTest.java | 92 +-- .../fabric/shim/impl/KeyValueImplTest.java | 15 +- ...ryResultsIteratorWithMetadataImplTest.java | 22 +- .../fabric/shim/ledger/CompositeKeyTest.java | 14 +- .../shim/mock/peer/ChaincodeMockPeer.java | 82 +-- .../fabric/shim/mock/peer/CompleteStep.java | 5 +- .../fabric/shim/mock/peer/DelValueStep.java | 5 +- .../shim/mock/peer/ErrorResponseStep.java | 5 +- .../shim/mock/peer/GetHistoryForKeyStep.java | 21 +- .../shim/mock/peer/GetQueryResultStep.java | 7 +- .../shim/mock/peer/GetStateByRangeStep.java | 6 +- .../shim/mock/peer/GetStateMetadata.java | 20 +- .../fabric/shim/mock/peer/GetValueStep.java | 14 +- .../shim/mock/peer/InvokeChaincodeStep.java | 18 +- .../fabric/shim/mock/peer/PurgeValueStep.java | 5 +- .../shim/mock/peer/PutStateMetadata.java | 19 +- .../fabric/shim/mock/peer/PutValueStep.java | 13 +- .../fabric/shim/mock/peer/QueryCloseStep.java | 10 +- .../fabric/shim/mock/peer/QueryNextStep.java | 7 +- .../shim/mock/peer/QueryResultStep.java | 27 +- .../fabric/shim/mock/peer/RegisterStep.java | 5 +- .../fabric/shim/mock/peer/ScenarioStep.java | 1 - .../fabric/shim/utils/MessageUtil.java | 15 +- .../fabric/shim/utils/TimeoutUtil.java | 11 +- .../hyperledger/fabric/traces/TracesTest.java | 31 +- .../traces/impl/DefaultProviderTest.java | 4 +- .../impl/OpenTelemetryPropertiesTest.java | 28 +- .../impl/OpenTelemetryTracesProviderTest.java | 45 +- .../traces/impl/TestSpanExporterProvider.java | 1 - gradle/libs.versions.toml | 5 + gradle/wrapper/gradle-wrapper.jar | Bin 43462 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 7 +- gradlew.bat | 2 + settings.gradle | 2 +- 210 files changed, 3135 insertions(+), 3641 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d64500d8..5914179d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: 17 - uses: gradle/actions/setup-gradle@v4 - name: Push to registry ${{ matrix.publish_target }} run: | @@ -65,7 +65,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: 17 - uses: gradle/actions/setup-gradle@v4 - name: Build the dependencies needed for the image run: ./gradlew :fabric-chaincode-docker:copyAllDeps diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index e87983eb..6147f760 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 + java-version: 17 - uses: gradle/actions/setup-gradle@v4 - name: Set up Go uses: actions/setup-go@v5 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7ae6e959..791e657a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 + java-version: 17 - uses: gradle/actions/setup-gradle@v4 - name: Build and Unit test run: ./gradlew :fabric-chaincode-shim:build @@ -36,7 +36,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 + java-version: 17 - uses: gradle/actions/setup-gradle@v4 - name: Populate chaincode with latest java-version run: | @@ -69,7 +69,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 + java-version: 17 - uses: gradle/actions/setup-gradle@v4 - name: Build Docker image run: ./gradlew :fabric-chaincode-docker:buildImage diff --git a/.gitignore b/.gitignore index 1e849943..78211b3e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ **/bin/ /build/ build/* +settings-gradle.lockfile _cfg repository diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8f624836..d872b5bc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,7 +28,7 @@ We use our own forks and [Github Flow](https://guides.github.com/introduction/fl ## Coding Style -Please to try to be consistent with the rest of the code and conform to checkstyle rules where they are provided. +Please to try to be consistent with the rest of the code and conform to checkstyle rules where they are provided. [Spotless](https://github.com/diffplug/spotless) is used to enforce code formatting. You can run `./gradlew spotlessApply` to apply the mandated code formatting to the codebase before submitting changes to avoid failing the build with formatting violations. ## Code of Conduct Guidelines diff --git a/build.gradle b/build.gradle index 094a38f0..0b11212f 100644 --- a/build.gradle +++ b/build.gradle @@ -6,12 +6,13 @@ plugins { id "com.github.ben-manes.versions" version "0.51.0" + alias libs.plugins.spotless } version = '2.5.5' -// If the nightly property is set, then this is the scheduled main +// If the nightly property is set, then this is the scheduled main // build - and we should publish this to artifactory // // Use the .dev. format to match Maven convention @@ -23,16 +24,27 @@ if (properties.containsKey('NIGHTLY')) { } allprojects { + apply plugin: libs.plugins.spotless.get().pluginId + repositories { mavenCentral() maven { url "https://oss.sonatype.org/content/repositories/snapshots" } maven { url "https://www.jitpack.io" } } + + spotless { + format 'misc', { + target '*.gradle', '.gitattributes', '.gitignore' + trimTrailingWhitespace() + indentWithSpaces() + endWithNewline() + } + } } subprojects { apply plugin: 'java' - apply plugin: 'maven-publish' + apply plugin: "maven-publish" group = 'org.hyperledger.fabric-chaincode-java' version = rootProject.version @@ -64,6 +76,13 @@ subprojects { useJUnitPlatform() } + spotless { + java { + removeUnusedImports() + palantirJavaFormat('2.50.0').formatJavadoc(true) + formatAnnotations() + } + } } task printVersionName() { diff --git a/ci/checkstyle/checkstyle.xml b/ci/checkstyle/checkstyle.xml index 14ee8c15..92b99a49 100644 --- a/ci/checkstyle/checkstyle.xml +++ b/ci/checkstyle/checkstyle.xml @@ -41,20 +41,8 @@ - - - - - - - - - - - - @@ -108,11 +96,6 @@ - - - - - diff --git a/fabric-chaincode-docker/build.gradle b/fabric-chaincode-docker/build.gradle index f65f9468..e5ba5d6c 100644 --- a/fabric-chaincode-docker/build.gradle +++ b/fabric-chaincode-docker/build.gradle @@ -67,4 +67,3 @@ task buildImage(type: DockerBuildImage) { inputDir = project.file('Dockerfile').parentFile images = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:2.5', 'hyperledger/fabric-javaenv:amd64-2.5.5', 'hyperledger/fabric-javaenv:amd64-latest'] } - diff --git a/fabric-chaincode-integration-test/build.gradle b/fabric-chaincode-integration-test/build.gradle index 08d1524e..9d2b1fc7 100644 --- a/fabric-chaincode-integration-test/build.gradle +++ b/fabric-chaincode-integration-test/build.gradle @@ -8,7 +8,7 @@ dependencies { test { // Always run tests, even when nothing changed. dependsOn 'cleanTest' - + // Show test results. testLogging { events "passed", "skipped", "failed" @@ -16,7 +16,7 @@ dependencies { showCauses true showStandardStreams true exceptionFormat "full" - + } } diff --git a/fabric-chaincode-integration-test/chaincodebootstrap.gradle b/fabric-chaincode-integration-test/chaincodebootstrap.gradle index 67b9b238..fce50a3e 100644 --- a/fabric-chaincode-integration-test/chaincodebootstrap.gradle +++ b/fabric-chaincode-integration-test/chaincodebootstrap.gradle @@ -9,4 +9,4 @@ allprojects { } } } -} \ No newline at end of file +} diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/contractinstall/ContractInstallTest.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/contractinstall/ContractInstallTest.java index 881ac8cd..b05dbf81 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/contractinstall/ContractInstallTest.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/contractinstall/ContractInstallTest.java @@ -5,40 +5,35 @@ */ package org.hyperleder.fabric.shim.integration.contractinstall; -import static org.hamcrest.core.StringContains.containsString; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.StringContains.containsString; import org.hyperleder.fabric.shim.integration.util.FabricState; import org.hyperleder.fabric.shim.integration.util.InvokeHelper; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -/** - * Basic Java Chaincode Test - * - */ +/** Basic Java Chaincode Test */ public class ContractInstallTest { - @BeforeAll + @BeforeAll public static void setUp() throws Exception { FabricState.getState().start(); - } - @Test - public void TestInstall(){ + @Test + public void TestInstall() { - InvokeHelper helper = InvokeHelper.newHelper("baregradlecc","sachannel"); + InvokeHelper helper = InvokeHelper.newHelper("baregradlecc", "sachannel"); String text = helper.invoke("org1", "whoami"); assertThat(text, containsString("BareGradle")); - - helper = InvokeHelper.newHelper("baremaven","sachannel"); + + helper = InvokeHelper.newHelper("baremaven", "sachannel"); text = helper.invoke("org1", "whoami"); assertThat(text, containsString("BareMaven")); - - helper = InvokeHelper.newHelper("wrappermaven","sachannel"); + + helper = InvokeHelper.newHelper("wrappermaven", "sachannel"); text = helper.invoke("org1", "whoami"); - assertThat(text, containsString("WrapperMaven")); + assertThat(text, containsString("WrapperMaven")); } - -} \ No newline at end of file +} diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/ledgertests/LedgerIntegrationTest.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/ledgertests/LedgerIntegrationTest.java index 20a1825e..ad856978 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/ledgertests/LedgerIntegrationTest.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/ledgertests/LedgerIntegrationTest.java @@ -4,34 +4,29 @@ SPDX-License-Identifier: Apache-2.0 */ package org.hyperleder.fabric.shim.integration.ledgertests; -import static org.hamcrest.core.StringContains.containsString; + import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.StringContains.containsString; import org.hyperleder.fabric.shim.integration.util.FabricState; import org.hyperleder.fabric.shim.integration.util.InvokeHelper; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -/** - * Basic Java Chaincode Test - * - */ +/** Basic Java Chaincode Test */ public class LedgerIntegrationTest { - @BeforeAll + @BeforeAll public static void setUp() throws Exception { - FabricState.getState().start(); } - @Test - public void TestLedgers(){ - InvokeHelper helper = InvokeHelper.newHelper("ledgercc","sachannel"); - + @Test + public void TestLedgers() { + InvokeHelper helper = InvokeHelper.newHelper("ledgercc", "sachannel"); + String text = helper.invoke("org1", "accessLedgers"); assertThat(text, containsString("success")); - } - } diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SACCIntegrationTest.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SACCIntegrationTest.java index 50b27c45..94ebb378 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SACCIntegrationTest.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SACCIntegrationTest.java @@ -4,37 +4,34 @@ SPDX-License-Identifier: Apache-2.0 */ package org.hyperleder.fabric.shim.integration.shimtests; -import static org.hamcrest.core.StringContains.containsString; + import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.StringContains.containsString; import org.hyperleder.fabric.shim.integration.util.FabricState; import org.hyperleder.fabric.shim.integration.util.InvokeHelper; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -/** - * Basic Java Chaincode Test - * - */ +/** Basic Java Chaincode Test */ public class SACCIntegrationTest { @BeforeAll public static void setUp() throws Exception { - FabricState.getState().start(); - + FabricState.getState().start(); } - @Test - public void TestLedger(){ + @Test + public void TestLedger() { InvokeHelper helper = InvokeHelper.newHelper("shimcc", "sachannel"); String text = helper.invoke("org1", "putBulkStates"); assertThat(text, containsString("success")); - - text = helper.invoke("org1", "getByRange","key120","key170"); + + text = helper.invoke("org1", "getByRange", "key120", "key170"); assertThat(text, containsString("50")); - text = helper.invoke("org1", "getByRangePaged","key120","key170","10",""); + text = helper.invoke("org1", "getByRangePaged", "key120", "key170", "10", ""); System.out.println(text); assertThat(text, containsString("key130")); @@ -42,5 +39,4 @@ public void TestLedger(){ System.out.println(text); assertThat(text, containsString("org.hyperledger.fabric.metrics.impl.DefaultProvider")); } - } diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SBECCIntegrationTest.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SBECCIntegrationTest.java index 418cdbf7..32e8ec56 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SBECCIntegrationTest.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SBECCIntegrationTest.java @@ -5,9 +5,9 @@ */ package org.hyperleder.fabric.shim.integration.shimtests; -import static org.hamcrest.core.StringContains.containsString; -import static org.hamcrest.Matchers.not; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.core.StringContains.containsString; import org.hyperleder.fabric.shim.integration.util.FabricState; import org.hyperleder.fabric.shim.integration.util.InvokeHelper; @@ -19,8 +19,6 @@ public class SBECCIntegrationTest { @BeforeAll public static void setUp() throws Exception { FabricState.getState().start(); - - } @Test @@ -61,7 +59,6 @@ public void RunSBE_pub_setget() { assertThat(text, containsString("org2MSP")); assertThat(text, containsString("org1MSP")); - text = helper.invoke("org1", "EndorsementCC:setval", mode, "val3"); assertThat(text, containsString("success")); @@ -85,10 +82,9 @@ public void RunSBE_pub_setget() { assertThat(text, containsString("success")); text = helper.invoke("org1", "EndorsementCC:recordExists", mode); assertThat(text, containsString("false")); - } - @Test + @Test public void RunSBE_priv() { final String mode = "priv"; @@ -126,7 +122,6 @@ public void RunSBE_priv() { text = helper.invoke("org1", "EndorsementCC:listorgs", mode); assertThat(text, containsString("org2MSP")); assertThat(text, containsString("org1MSP")); - text = helper.invoke("org1", "EndorsementCC:setval", mode, "val3"); assertThat(text, containsString("success")); @@ -151,7 +146,5 @@ public void RunSBE_priv() { assertThat(text, containsString("success")); text = helper.invoke("org1", "EndorsementCC:recordExists", mode); assertThat(text, containsString("false")); - } - } diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Bash.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Bash.java index b135a48b..2440e224 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Bash.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Bash.java @@ -4,23 +4,20 @@ SPDX-License-Identifier: Apache-2.0 */ package org.hyperleder.fabric.shim.integration.util; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -/** Represents the 'peer' cli command - * - * - * - */ +/** Represents the 'peer' cli command */ public final class Bash extends Command { - public static BashBuilder newBuilder(){ + public static BashBuilder newBuilder() { return new BashBuilder(); } - static public class BashBuilder extends Command.Builder { + public static class BashBuilder extends Command.Builder { String cmd; String orderer; String channel; @@ -28,7 +25,7 @@ static public class BashBuilder extends Command.Builder { boolean evaluate = false; int waitForEventTimeout; List args = new ArrayList(); - Map transientData; + Map transientData; public BashBuilder duplicate() { try { @@ -40,26 +37,25 @@ public BashBuilder duplicate() { } } - public BashBuilder cmd(String cmd){ + public BashBuilder cmd(String cmd) { this.cmd = cmd; return this; } - public BashBuilder cmdargs(String argsArray[]){ + public BashBuilder cmdargs(String argsArray[]) { this.args = Arrays.asList(argsArray); return this; } - public Bash build(Map additionalEnv){ + public Bash build(Map additionalEnv) { ArrayList list = new ArrayList<>(); list.add(cmd); - return new Bash(list,additionalEnv); + return new Bash(list, additionalEnv); } - - public Bash build(){ + public Bash build() { ArrayList list = new ArrayList<>(); list.add(cmd); @@ -71,9 +67,9 @@ public Bash build(){ Bash(List cmd) { super(cmd); - } + } - Bash(List cmd, Map env) { - super(cmd, env); + Bash(List cmd, Map env) { + super(cmd, env); } -} \ No newline at end of file +} diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Command.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Command.java index a18a282e..a4a759e8 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Command.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Command.java @@ -25,7 +25,7 @@ public class Command { protected final List cmd; protected final Map env = new HashMap<>(); - Command(List cmd, Map additionalEnv){ + Command(List cmd, Map additionalEnv) { this.cmd = cmd; this.env.putAll(additionalEnv); } @@ -40,16 +40,14 @@ public static final class Result { public int exitcode; } - /** - * Run but don't suppress the output being printed directly - */ + /** Run but don't suppress the output being printed directly */ public Result run() { return this.run(false); } /** * Run the command, and process the output to arrays for later parsing and checking - * + * * @param quiet true if the output should NOT be printed directly to System.out/System.err */ public Result run(boolean quiet) { @@ -60,22 +58,24 @@ public Result run(boolean quiet) { System.out.println("Running:" + this); try { - + processBuilder.redirectInput(Redirect.INHERIT); processBuilder.redirectErrorStream(true); - + Process process = processBuilder.start(); System.out.println("Started..... "); - CompletableFuture> soutFut = readOutStream(process.getInputStream(),quiet?null:System.out); - CompletableFuture> serrFut = readOutStream(process.getErrorStream(),quiet?null:System.err); + CompletableFuture> soutFut = + readOutStream(process.getInputStream(), quiet ? null : System.out); + CompletableFuture> serrFut = + readOutStream(process.getErrorStream(), quiet ? null : System.err); CompletableFuture resultFut = soutFut.thenCombine(serrFut, (stdout, stderr) -> { - // print to current stderr the stderr of process and return the stdout + // print to current stderr the stderr of process and return the stdout result.stderr = stderr; result.stdout = stdout; return result; - }); + }); result.exitcode = process.waitFor(); // get stdout once ready, blocking @@ -91,18 +91,19 @@ public Result run(boolean quiet) { /** * Collect the information from the executed process and add them to a result object - * + * * @param is * @param stream * @return Completable Future with the array list of the stdout/stderr */ CompletableFuture> readOutStream(InputStream is, PrintStream stream) { return CompletableFuture.supplyAsync(() -> { - try (InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr);) { + try (InputStreamReader isr = new InputStreamReader(is); + BufferedReader br = new BufferedReader(isr); ) { ArrayList res = new ArrayList<>(); String inputLine; while ((inputLine = br.readLine()) != null) { - if (stream!=null) stream.println(inputLine); + if (stream != null) stream.println(inputLine); res.add(inputLine); } return res; @@ -116,7 +117,7 @@ public String toString() { return "[" + String.join(" ", cmd) + "]"; } - static public class Builder implements Cloneable { + public static class Builder implements Cloneable { @SuppressWarnings("unchecked") public Builder duplicate() { try { diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Docker.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Docker.java index f500d333..e24bed82 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Docker.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Docker.java @@ -4,17 +4,14 @@ SPDX-License-Identifier: Apache-2.0 */ package org.hyperleder.fabric.shim.integration.util; + import java.util.ArrayList; import java.util.List; -/** Represents the 'docker' cli command - * - * - * - */ +/** Represents the 'docker' cli command */ public final class Docker extends Command { - public static DockerBuilder newBuilder(){ + public static DockerBuilder newBuilder() { return new DockerBuilder(); } @@ -32,58 +29,55 @@ public DockerBuilder duplicate() { return null; } } - - public DockerBuilder script(String script){ + + public DockerBuilder script(String script) { this.script = script; return this; } - - public DockerBuilder channel(String channel){ + + public DockerBuilder channel(String channel) { this.channel = channel; return this; } - public DockerBuilder container(String container){ + public DockerBuilder container(String container) { this.container = container; return this; } - public DockerBuilder exec(){ + public DockerBuilder exec() { this.exec = true; return this; } - public Docker build(){ + public Docker build() { ArrayList list = new ArrayList<>(); list.add("docker"); - if(exec){ + if (exec) { list.add("exec"); - } - - if (container == null || container.isEmpty()){ + + if (container == null || container.isEmpty()) { throw new RuntimeException("container should be set"); } list.add(container); - - if (script == null || script.isEmpty()){ + + if (script == null || script.isEmpty()) { throw new RuntimeException("script should be set"); } list.add(script); - - if (channel == null || channel.isEmpty()){ + + if (channel == null || channel.isEmpty()) { throw new RuntimeException("channel should be set"); } list.add(channel); - return new Docker(list); } } - + Docker(List cmd) { - super(cmd); + super(cmd); } - -} \ No newline at end of file +} diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/DockerCompose.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/DockerCompose.java index 3beaac55..50a2e8eb 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/DockerCompose.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/DockerCompose.java @@ -4,71 +4,66 @@ SPDX-License-Identifier: Apache-2.0 */ package org.hyperleder.fabric.shim.integration.util; + import java.util.ArrayList; import java.util.List; -/** Represents the 'peer' cli command - * - * - * - */ +/** Represents the 'peer' cli command */ public final class DockerCompose extends Command { - public static DockerComposeBuilder newBuilder(){ + public static DockerComposeBuilder newBuilder() { return new DockerComposeBuilder(); } - - public static final class DockerComposeBuilder extends Command.Builder{ + + public static final class DockerComposeBuilder extends Command.Builder { String composeFile; boolean up = true; boolean detach = false; - public DockerComposeBuilder file(String composeFile){ + public DockerComposeBuilder file(String composeFile) { this.composeFile = composeFile; return this; } - + public DockerComposeBuilder duplicate() { return (DockerComposeBuilder) super.duplicate(); } - public DockerComposeBuilder up(){ + public DockerComposeBuilder up() { this.up = true; return this; } - - public DockerComposeBuilder detach(){ + + public DockerComposeBuilder detach() { this.detach = true; return this; } - - public DockerComposeBuilder down(){ + + public DockerComposeBuilder down() { this.up = false; return this; } - - public DockerCompose build(){ + + public DockerCompose build() { ArrayList list = new ArrayList<>(); list.add("docker-compose"); - if (composeFile!=null && !composeFile.isEmpty()) { + if (composeFile != null && !composeFile.isEmpty()) { list.add("-f"); list.add(composeFile); } - list.add(up?"up":"down"); - if (detach){ + list.add(up ? "up" : "down"); + if (detach) { list.add("-d"); } - return new DockerCompose(list); } } - + DockerCompose(List cmd) { - super(cmd); - super.env.put("COMPOSE_PROJECT_NAME","first-network"); + super(cmd); + super.env.put("COMPOSE_PROJECT_NAME", "first-network"); } - -} \ No newline at end of file +} diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/FabricState.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/FabricState.java index 59909a2a..8483446e 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/FabricState.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/FabricState.java @@ -10,7 +10,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.Semaphore; - import org.hyperleder.fabric.shim.integration.util.Bash.BashBuilder; public final class FabricState { @@ -49,15 +48,14 @@ public Map orgEnv(String org) { Map env = new HashMap<>(); - env.put("CORE_PEER_MSPCONFIGPATH", - Paths.get(s, "src/test/resources/_cfg/_msp/" + org, org + "admin/msp").toString()); + env.put( + "CORE_PEER_MSPCONFIGPATH", + Paths.get(s, "src/test/resources/_cfg/_msp/" + org, org + "admin/msp") + .toString()); env.put("CORE_PEER_LOCALMSPID", org + "MSP"); env.put("CORE_PEER_ADDRESS", org + "peer-api.127-0-0-1.nip.io:8080"); - System.out.println(env); return env; - } - -} \ No newline at end of file +} diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/InvokeHelper.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/InvokeHelper.java index 971cb252..6d4915f8 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/InvokeHelper.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/InvokeHelper.java @@ -1,49 +1,47 @@ package org.hyperleder.fabric.shim.integration.util; -import org.hyperleder.fabric.shim.integration.util.Command.Result; -import org.hyperleder.fabric.shim.integration.util.Peer.PeerBuilder; - import java.util.Arrays; import java.util.Map; import java.util.stream.Collectors; +import org.hyperleder.fabric.shim.integration.util.Command.Result; +import org.hyperleder.fabric.shim.integration.util.Peer.PeerBuilder; public class InvokeHelper { - + private String ccname; private String channel; - + public static InvokeHelper newHelper(String ccname, String channel) { - + InvokeHelper ih = new InvokeHelper(); - + ih.ccname = ccname; ih.channel = channel; - + return ih; } - - public String invoke(String org, String... args){ - Map orgEnv = FabricState.getState().orgEnv(org); + + public String invoke(String org, String... args) { + Map orgEnv = FabricState.getState().orgEnv(org); PeerBuilder coreBuilder = Peer.newBuilder().ccname(ccname).channel(channel); Result r = coreBuilder.argsTx(args).build(orgEnv).run(); System.out.println(r.stdout); String text = r.stdout.stream() - .filter(line -> line.matches(".*chaincodeInvokeOrQuery.*")) - .collect(Collectors.joining(System.lineSeparator())) - .trim(); + .filter(line -> line.matches(".*chaincodeInvokeOrQuery.*")) + .collect(Collectors.joining(System.lineSeparator())) + .trim(); - if (!text.contains("result: status:200")){ + if (!text.contains("result: status:200")) { Command logsCommand = new Command(Arrays.asList("docker", "logs", "microfab"), orgEnv); logsCommand.run(); throw new RuntimeException(text); - } + } int payloadIndex = text.indexOf("payload:"); - if (payloadIndex>1){ - return text.substring(payloadIndex+9,text.length()-1); + if (payloadIndex > 1) { + return text.substring(payloadIndex + 9, text.length() - 1); } return "success"; } - } diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java index 99c19111..65f045b3 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java @@ -4,22 +4,18 @@ SPDX-License-Identifier: Apache-2.0 */ package org.hyperleder.fabric.shim.integration.util; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; - import org.json.JSONArray; import org.json.JSONObject; -/** Represents the 'peer' cli command - * - * - * - */ +/** Represents the 'peer' cli command */ public final class Peer extends Command { - public static PeerBuilder newBuilder(){ + public static PeerBuilder newBuilder() { return new PeerBuilder(); } @@ -31,7 +27,7 @@ public static final class PeerBuilder extends Command.Builder { boolean evaluate = false; int waitForEventTimeout; List args = new ArrayList(); - Map transientData; + Map transientData; public PeerBuilder duplicate() { try { @@ -43,64 +39,64 @@ public PeerBuilder duplicate() { } } - public PeerBuilder tlsArgs(String tlsArgs){ + public PeerBuilder tlsArgs(String tlsArgs) { this.tlsArgs = tlsArgs; return this; } - public PeerBuilder orderer(String orderer){ + public PeerBuilder orderer(String orderer) { this.orderer = orderer; return this; } - public PeerBuilder channel(String channel){ + public PeerBuilder channel(String channel) { this.channel = channel; return this; } - public PeerBuilder ccname(String ccname){ + public PeerBuilder ccname(String ccname) { this.ccname = ccname; return this; } - public PeerBuilder evaluate(){ + public PeerBuilder evaluate() { this.evaluate = true; return this; } - public PeerBuilder invoke(){ + public PeerBuilder invoke() { this.evaluate = false; return this; } - public PeerBuilder argsTx(List args){ + public PeerBuilder argsTx(List args) { this.args = args; return this; } - public PeerBuilder argsTx(String[] argsArray){ + public PeerBuilder argsTx(String[] argsArray) { this.args = Arrays.asList(argsArray); return this; } - public PeerBuilder transientData(Map transientData){ + public PeerBuilder transientData(Map transientData) { this.transientData = transientData; return this; } - public PeerBuilder waitForEvent(int seconds){ + public PeerBuilder waitForEvent(int seconds) { this.waitForEventTimeout = seconds; return this; } - public PeerBuilder waitForEvent(){ + public PeerBuilder waitForEvent() { this.waitForEvent(0); return this; } private String transientToString() { JSONObject json = new JSONObject(this.transientData); - return "'"+json.toString()+"'"; + return "'" + json.toString() + "'"; } private String argsToString() { @@ -110,43 +106,43 @@ private String argsToString() { return json.toString(); } - public Peer build(Map additionalEnv){ + public Peer build(Map additionalEnv) { ArrayList list = new ArrayList<>(); list.add("peer"); list.add("chaincode"); - list.add(evaluate?"query":"invoke"); + list.add(evaluate ? "query" : "invoke"); if (tlsArgs != null && !tlsArgs.isEmpty()) { list.add(tlsArgs); } - if (channel == null || channel.isEmpty()){ + if (channel == null || channel.isEmpty()) { throw new RuntimeException("Channel should be set"); } list.add("-C"); list.add(channel); - if (ccname == null || ccname.isEmpty()){ + if (ccname == null || ccname.isEmpty()) { throw new RuntimeException("Chaincode name should be set"); } list.add("-n"); list.add(ccname); - if (args == null || args.isEmpty()){ + if (args == null || args.isEmpty()) { throw new RuntimeException("Args should be set"); } list.add("-c"); list.add(argsToString()); - if (transientData != null && !transientData.isEmpty()){ + if (transientData != null && !transientData.isEmpty()) { list.add("--transient"); list.add(transientToString()); } - if (waitForEventTimeout>0){ + if (waitForEventTimeout > 0) { list.add("--waitForEvent --waitForEventTimeout"); - list.add(waitForEventTimeout+"s"); - } else if (waitForEventTimeout == 0 ){ + list.add(waitForEventTimeout + "s"); + } else if (waitForEventTimeout == 0) { list.add("--waitForEvent"); } @@ -155,12 +151,11 @@ public Peer build(Map additionalEnv){ list.add("--peerAddresses"); list.add("org2peer-api.127-0-0-1.nip.io:8080"); - return new Peer(list,additionalEnv); + return new Peer(list, additionalEnv); } } - - Peer(List cmd, Map additionalEnv) { - super(cmd,additionalEnv); + Peer(List cmd, Map additionalEnv) { + super(cmd, additionalEnv); } -} \ No newline at end of file +} diff --git a/fabric-chaincode-shim/build.gradle b/fabric-chaincode-shim/build.gradle index ded8f870..24c0e79f 100644 --- a/fabric-chaincode-shim/build.gradle +++ b/fabric-chaincode-shim/build.gradle @@ -47,7 +47,7 @@ tasks.withType(org.gradle.api.tasks.testing.Test) { dependencies { implementation platform('com.google.protobuf:protobuf-bom:3.25.5') implementation platform('io.grpc:grpc-bom:1.68.0') - implementation platform('io.opentelemetry:opentelemetry-bom:1.42.1') + implementation platform('io.opentelemetry:opentelemetry-bom:1.43.0') implementation 'org.hyperledger.fabric:fabric-protos:0.3.3' implementation 'org.bouncycastle:bcpkix-jdk18on:1.78.1' @@ -56,7 +56,7 @@ dependencies { implementation 'com.github.everit-org.json-schema:org.everit.json.schema:1.14.4' implementation 'org.json:json:20240303' implementation 'com.google.protobuf:protobuf-java-util' - + implementation 'io.grpc:grpc-netty-shaded' implementation 'io.grpc:grpc-protobuf' implementation 'io.grpc:grpc-stub' @@ -64,14 +64,15 @@ dependencies { // Required if using Java 11+ as no longer bundled in the core libraries testImplementation 'javax.xml.bind:jaxb-api:2.3.1' - implementation 'io.opentelemetry:opentelemetry-api' - implementation 'io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha' + compileOnly 'io.opentelemetry:opentelemetry-api' implementation 'io.opentelemetry:opentelemetry-sdk' implementation 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure' implementation 'io.opentelemetry:opentelemetry-sdk-trace' implementation 'io.opentelemetry:opentelemetry-exporter-otlp' implementation 'io.opentelemetry:opentelemetry-extension-trace-propagators' - implementation 'io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.8.0-alpha' + implementation 'io.opentelemetry.semconv:opentelemetry-semconv' + implementation 'io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha' + implementation 'io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.9.0-alpha' } sourceSets { @@ -226,7 +227,7 @@ javadoc { source = sourceSets.main.allJava classpath = sourceSets.main.runtimeClasspath - + javadoc.options.addStringOption('Xdoclint:none', '-quiet') options.overview = "src/main/java/org/hyperledger/fabric/overview.html" } @@ -297,7 +298,7 @@ publishing { username = project.findProperty('ossrhUsername') password = project.findProperty('ossrhPassword') } - + } maven { diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/Logger.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/Logger.java index c8b0f9d6..e1a55c90 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/Logger.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/Logger.java @@ -11,10 +11,7 @@ import java.util.logging.Level; import java.util.logging.LogManager; -/** - * Logger class to use throughout the Contract Implementation. - * - */ +/** Logger class to use throughout the Contract Implementation. */ public class Logger extends java.util.logging.Logger { protected Logger(final String name) { @@ -32,16 +29,12 @@ public static Logger getLogger(final String name) { return new Logger(name); } - /** - * @param msgSupplier - */ + /** @param msgSupplier */ public void debug(final Supplier msgSupplier) { log(Level.FINEST, msgSupplier); } - /** - * @param msg - */ + /** @param msg */ public void debug(final String msg) { log(Level.FINEST, msg); } @@ -57,16 +50,12 @@ public static Logger getLogger(final Class class1) { return l; } - /** - * @param message - */ + /** @param message */ public void error(final String message) { log(Level.SEVERE, message); } - /** - * @param msgSupplier - */ + /** @param msgSupplier */ public void error(final Supplier msgSupplier) { log(Level.SEVERE, msgSupplier); } @@ -92,5 +81,4 @@ public String formatError(final Throwable throwable) { return buffer.toString(); } - } diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/Logging.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/Logging.java index b6369056..1d26eaf4 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/Logging.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/Logging.java @@ -15,31 +15,22 @@ /** * Assistance class to use when logging. * - * For chaincode/contract implementations please use java.util.logging or your - * own framework. All the Hyperledger Fabric code here is logged in loggers with - * names starting org.hyperledger + *

For chaincode/contract implementations please use java.util.logging or your own framework. All the Hyperledger + * Fabric code here is logged in loggers with names starting org.hyperledger * - * Control of this is via the environment variables - * 'CORE_CHAINCODE_LOGGING_LEVEL' this takes a string that matches the following - * Java.util.logging levels (case insensitive) - * - * CRITICAL, ERROR == Level.SEVERE, WARNING == Level.WARNING, INFO == Level.INFO - * NOTICE == Level.CONFIG, DEBUG == Level.FINEST + *

Control of this is via the environment variables 'CORE_CHAINCODE_LOGGING_LEVEL' this takes a string that matches + * the following Java.util.logging levels (case insensitive) * + *

CRITICAL, ERROR == Level.SEVERE, WARNING == Level.WARNING, INFO == Level.INFO NOTICE == Level.CONFIG, DEBUG == + * Level.FINEST */ public final class Logging { - /** - * Name of the Performance logger. - */ + /** Name of the Performance logger. */ public static final String PERFLOGGER = "org.hyperledger.Performance"; - /** Private Constructor. - * - */ - private Logging() { - - } + /** Private Constructor. */ + private Logging() {} /** * Formats a Throwable to a string with details of all the causes. @@ -63,7 +54,6 @@ public static String formatError(final Throwable throwable) { } return buffer.toString(); - } /** @@ -79,30 +69,33 @@ public static void setLogLevel(final String newLevel) { // so find those that have the correct stem. final ArrayList allLoggers = Collections.list(logManager.getLoggerNames()); allLoggers.add("org.hyperledger"); - allLoggers.stream().filter(name -> name.startsWith("org.hyperledger")).map(name -> logManager.getLogger(name)).forEach(logger -> { - if (logger != null) { - logger.setLevel(l); - } - }); + allLoggers.stream() + .filter(name -> name.startsWith("org.hyperledger")) + .map(name -> logManager.getLogger(name)) + .forEach(logger -> { + if (logger != null) { + logger.setLevel(l); + } + }); } private static Level mapLevel(final String level) { if (level != null) { switch (level.toUpperCase().trim()) { - case "ERROR": - case "CRITICAL": - return Level.SEVERE; - case "WARNING": - case "WARN": - return Level.WARNING; - case "INFO": - return Level.INFO; - case "NOTICE": - return Level.CONFIG; - case "DEBUG": - return Level.FINEST; - default: - return Level.INFO; + case "ERROR": + case "CRITICAL": + return Level.SEVERE; + case "WARNING": + case "WARN": + return Level.WARNING; + case "INFO": + return Level.INFO; + case "NOTICE": + return Level.CONFIG; + case "DEBUG": + return Level.FINEST; + default: + return Level.INFO; } } return Level.INFO; diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ClientIdentity.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ClientIdentity.java index 078e0657..4c10f704 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ClientIdentity.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ClientIdentity.java @@ -15,7 +15,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; - import org.bouncycastle.asn1.ASN1InputStream; import org.bouncycastle.asn1.ASN1Primitive; import org.bouncycastle.asn1.DEROctetString; @@ -26,12 +25,9 @@ import org.json.JSONObject; /** - * ClientIdentity represents information about the identity that submitted a - * transaction. Chaincodes can use this class to obtain information about the - * submitting identity including a unique ID, the MSP (Membership Service - * Provider) ID, and attributes. Such information is useful in enforcing access - * control by the chaincode. - * + * ClientIdentity represents information about the identity that submitted a transaction. Chaincodes can use this class + * to obtain information about the submitting identity including a unique ID, the MSP (Membership Service Provider) ID, + * and attributes. Such information is useful in enforcing access control by the chaincode. */ public final class ClientIdentity { private static Logger logger = Logger.getLogger(ContractRouter.class.getName()); @@ -60,7 +56,8 @@ public ClientIdentity(final ChaincodeStub stub) throws CertificateException, JSO final byte[] idBytes = si.getIdBytes().toByteArray(); - final X509Certificate cert = (X509Certificate) CertificateFactory.getInstance("X509").generateCertificate(new ByteArrayInputStream(idBytes)); + final X509Certificate cert = (X509Certificate) + CertificateFactory.getInstance("X509").generateCertificate(new ByteArrayInputStream(idBytes)); this.cert = cert; this.attrs = new HashMap(); @@ -71,12 +68,12 @@ public ClientIdentity(final ChaincodeStub stub) throws CertificateException, JSO } // Populate identity - this.id = "x509::" + cert.getSubjectDN().getName() + "::" + cert.getIssuerDN().getName(); + this.id = "x509::" + cert.getSubjectDN().getName() + "::" + + cert.getIssuerDN().getName(); } /** - * getId returns the ID associated with the invoking identity. This ID is - * guaranteed to be unique within the MSP. + * getId returns the ID associated with the invoking identity. This ID is guaranteed to be unique within the MSP. * * @return {String} A string in the format: "x509::{subject DN}::{issuer DN}" */ @@ -96,10 +93,9 @@ public String getMSPID() { /** * parseAttributes returns a map of the attributes associated with an identity. * - * @param extensionValue DER-encoded Octet string stored in the attributes - * extension of the certificate, as a byte array - * @return attrMap {Map} a map of identity attributes as key - * value pair strings + * @param extensionValue DER-encoded Octet string stored in the attributes extension of the certificate, as a byte + * array + * @return attrMap {Map} a map of identity attributes as key value pair strings * @throws IOException */ private Map parseAttributes(final byte[] extensionValue) throws IOException { @@ -107,7 +103,8 @@ private Map parseAttributes(final byte[] extensionValue) throws final Map attrMap = new HashMap(); // Create ASN1InputStream from extensionValue - try (ByteArrayInputStream inStream = new ByteArrayInputStream(extensionValue); ASN1InputStream asn1InputStream = new ASN1InputStream(inStream)) { + try (ByteArrayInputStream inStream = new ByteArrayInputStream(extensionValue); + ASN1InputStream asn1InputStream = new ASN1InputStream(inStream)) { // Read the DER object final ASN1Primitive derObject = asn1InputStream.readObject(); @@ -136,16 +133,13 @@ private Map parseAttributes(final byte[] extensionValue) throws } /** - * getAttributeValue returns the value of the client's attribute named - * `attrName`. If the invoking identity possesses the attribute, returns the - * value of the attribute. If the invoking identity does not possess the + * getAttributeValue returns the value of the client's attribute named `attrName`. If the invoking identity + * possesses the attribute, returns the value of the attribute. If the invoking identity does not possess the * attribute, returns null. * - * @param attrName Name of the attribute to retrieve the value from the - * identity's credentials (such as x.509 certificate for - * PKI-based MSPs). - * @return {String | null} Value of the attribute or null if the invoking - * identity does not possess the attribute. + * @param attrName Name of the attribute to retrieve the value from the identity's credentials (such as x.509 + * certificate for PKI-based MSPs). + * @return {String | null} Value of the attribute or null if the invoking identity does not possess the attribute. */ public String getAttributeValue(final String attrName) { if (this.attrs.containsKey(attrName)) { @@ -156,16 +150,14 @@ public String getAttributeValue(final String attrName) { } /** - * assertAttributeValue verifies that the invoking identity has the attribute - * named `attrName` with a value of `attrValue`. + * assertAttributeValue verifies that the invoking identity has the attribute named `attrName` with a value of + * `attrValue`. * - * @param attrName Name of the attribute to retrieve the value from the - * identity's credentials (such as x.509 certificate for - * PKI-based MSPs) + * @param attrName Name of the attribute to retrieve the value from the identity's credentials (such as x.509 + * certificate for PKI-based MSPs) * @param attrValue Expected value of the attribute - * @return {boolean} True if the invoking identity possesses the attribute and - * the attribute value matches the expected value. Otherwise, returns - * false. + * @return {boolean} True if the invoking identity possesses the attribute and the attribute value matches the + * expected value. Otherwise, returns false. */ public boolean assertAttributeValue(final String attrName, final String attrValue) { if (!this.attrs.containsKey(attrName)) { @@ -176,9 +168,8 @@ public boolean assertAttributeValue(final String attrName, final String attrValu } /** - * getX509Certificate returns the X509 certificate associated with the invoking - * identity, or null if it was not identified by an X509 certificate, for - * instance if the MSP is implemented with an alternative to PKI such as + * getX509Certificate returns the X509 certificate associated with the invoking identity, or null if it was not + * identified by an X509 certificate, for instance if the MSP is implemented with an alternative to PKI such as * [Identity Mixer](https://jira.hyperledger.org/browse/FAB-5673). * * @return {X509Certificate | null} diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/Context.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/Context.java index c11f17f9..ea0b4d36 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/Context.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/Context.java @@ -8,22 +8,17 @@ import java.io.IOException; import java.security.cert.CertificateException; - import org.hyperledger.fabric.shim.ChaincodeStub; import org.json.JSONException; /** + * This context is available to all 'transaction functions' and provides the transaction context. It also provides + * access to the APIs for the world state using {@link #getStub()} * - * This context is available to all 'transaction functions' and provides the - * transaction context. It also provides access to the APIs for the world state - * using {@link #getStub()} - *

- * Applications can implement their own versions if they wish to add - * functionality. All subclasses MUST implement a constructor, for example - * - * 

- * {@code
+ * 
Applications can implement their own versions if they wish to add functionality. All subclasses MUST implement a
+ * constructor, for example
  *
+ * 
{@code
  * public MyContext extends Context {
  *
  *     public MyContext(ChaincodeStub stub) {
@@ -31,19 +26,13 @@
  *     }
  * }
  *
- *}
- * 

- *
+ * }
*/ public class Context { - /** - * - */ + /** */ protected ChaincodeStub stub; - /** - * - */ + /** */ protected ClientIdentity clientIdentity; /** @@ -60,18 +49,12 @@ public Context(final ChaincodeStub stub) { } } - /** - * - * @return ChaincodeStub instance to use - */ + /** @return ChaincodeStub instance to use */ public ChaincodeStub getStub() { return this.stub; } - /** - * - * @return ClientIdentity object to use - */ + /** @return ClientIdentity object to use */ public ClientIdentity getClientIdentity() { return this.clientIdentity; } diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContextFactory.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContextFactory.java index b282dc2d..64e12a1b 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContextFactory.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContextFactory.java @@ -8,17 +8,11 @@ import org.hyperledger.fabric.shim.ChaincodeStub; -/** - * Factory to create {@link Context} from {@link ChaincodeStub} by wrapping stub - * with dynamic proxy. - */ +/** Factory to create {@link Context} from {@link ChaincodeStub} by wrapping stub with dynamic proxy. */ public final class ContextFactory { private static ContextFactory cf; - /** - * - * @return ContextFactory - */ + /** @return ContextFactory */ public static synchronized ContextFactory getInstance() { if (cf == null) { cf = new ContextFactory(); @@ -27,7 +21,6 @@ public static synchronized ContextFactory getInstance() { } /** - * * @param stub * @return Context */ @@ -35,5 +28,4 @@ public Context createContext(final ChaincodeStub stub) { final Context newContext = new Context(stub); return newContext; } - } diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractInterface.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractInterface.java index 9ef0352e..c9bea5fc 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractInterface.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractInterface.java @@ -12,52 +12,44 @@ /** * All Contracts should implement this interface, in addition to the * {@linkplain org.hyperledger.fabric.contract.annotation.Contract} annotation. - *

- * All methods on this interface have default implementations; for - * many contracts it may not be needed to sub-class these. - *

- * Each method on the Contract that is marked with the {@link org.hyperledger.fabric.contract.annotation.Transaction} - * annotation is considered a Transaction Function. This is eligible for - * calling. Each transaction function is supplied with its first parameter - * being a {@link org.hyperledger.fabric.contract.Context}. The other parameters - * are supplied at the developer's discretion. - *

- * The sequence of calls is + * + *

All methods on this interface have default implementations; for many contracts it may not be needed to sub-class + * these. + * + *

Each method on the Contract that is marked with the {@link org.hyperledger.fabric.contract.annotation.Transaction} + * annotation is considered a Transaction Function. This is eligible for calling. Each transaction function is supplied + * with its first parameter being a {@link org.hyperledger.fabric.contract.Context}. The other parameters are supplied + * at the developer's discretion. + * + *

The sequence of calls is * * 

  * createContext()  -> beforeTransaction() -> the transaction function -> afterTransaction()
  *
- *

- * If any of these functions throws an exception it is considered an error case - * and the whole transaction is failed. The - * {@link org.hyperledger.fabric.contract.Context} is a very important object as - * it provides transactional context for access to current transaction id, - * ledger state, etc. - *

- * Note on Threading - *

- * All code should be 'Thread Friendly'. Each method must not rely on instance - * fields or class side variables for storage. Nor should they use any - * ThreadLocal Storage. Ledger data is stored via the ledger api available via - * the {@link Context}. - *

- * If information needs to be passed from - * {@link #beforeTransaction(Context)} to - * {@link #afterTransaction(Context, Object)} or between separate transaction - * functions when called directly then a subclass of the {@link Context} - * should be provided. + * + *

If any of these functions throws an exception it is considered an error case and the whole transaction is failed. + * The {@link org.hyperledger.fabric.contract.Context} is a very important object as it provides transactional context + * for access to current transaction id, ledger state, etc. + * + *

Note on Threading + * + *

All code should be 'Thread Friendly'. Each method must not rely on instance fields or class side variables for + * storage. Nor should they use any ThreadLocal Storage. Ledger data is stored via the ledger api available via the + * {@link Context}. + * + *

If information needs to be passed from {@link #beforeTransaction(Context)} to {@link #afterTransaction(Context, + * Object)} or between separate transaction functions when called directly then a subclass of the {@link Context} should + * be provided. */ public interface ContractInterface { /** * Create context from {@link ChaincodeStub}. * - * Default impl provided, but can be - * overwritten by contract + *

Default impl provided, but can be overwritten by contract * * @param stub Instance of the ChaincodeStub to use for this transaction - * @return instance of the context to use for the current transaction being - * executed + * @return instance of the context to use for the current transaction being executed */ default Context createContext(final ChaincodeStub stub) { return ContextFactory.getInstance().createContext(stub); @@ -66,9 +58,8 @@ default Context createContext(final ChaincodeStub stub) { /** * Invoked for any transaction that does not exist. * - * This will throw an exception. If you wish to alter the exception thrown or if - * you wish to consider requests for transactions that don't exist as not an - * error, subclass this method. + *

This will throw an exception. If you wish to alter the exception thrown or if you wish to consider requests + * for transactions that don't exist as not an error, subclass this method. * * @param ctx the context as created by {@link #createContext(ChaincodeStub)}. */ @@ -79,25 +70,21 @@ default void unknownTransaction(final Context ctx) { /** * Invoked once before each transaction. * - * Any exceptions thrown will fail the transaction, and neither the required - * transaction or the {@link #afterTransaction(Context, Object)} will be called + *

Any exceptions thrown will fail the transaction, and neither the required transaction or the + * {@link #afterTransaction(Context, Object)} will be called * * @param ctx the context as created by {@link #createContext(ChaincodeStub)}. */ - default void beforeTransaction(final Context ctx) { - } + default void beforeTransaction(final Context ctx) {} /** * Invoked once after each transaction. * - * Any exceptions thrown will fail the transaction. + *

Any exceptions thrown will fail the transaction. * - * @param ctx the context as created by - * {@link #createContext(ChaincodeStub)}. - * @param result The object returned from the transaction function if any. As - * this is a Java object and therefore pass-by-reference it is - * possible to modify this object. + * @param ctx the context as created by {@link #createContext(ChaincodeStub)}. + * @param result The object returned from the transaction function if any. As this is a Java object and therefore + * pass-by-reference it is possible to modify this object. */ - default void afterTransaction(final Context ctx, final Object result) { - } + default void afterTransaction(final Context ctx, final Object result) {} } diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractRouter.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractRouter.java index 510f1498..0219f71d 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractRouter.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractRouter.java @@ -6,6 +6,9 @@ package org.hyperledger.fabric.contract; +import java.io.IOException; +import java.util.Properties; +import java.util.logging.Logger; import org.hyperledger.fabric.Logging; import org.hyperledger.fabric.contract.execution.ExecutionFactory; import org.hyperledger.fabric.contract.execution.ExecutionService; @@ -25,13 +28,9 @@ import org.hyperledger.fabric.shim.ResponseUtils; import org.hyperledger.fabric.traces.Traces; -import java.io.IOException; -import java.util.Properties; -import java.util.logging.Logger; - /** - * Router class routes Init/Invoke requests to contracts. Implements - * {@link org.hyperledger.fabric.shim.Chaincode} interface. + * Router class routes Init/Invoke requests to contracts. Implements {@link org.hyperledger.fabric.shim.Chaincode} + * interface. * * @see ContractInterface */ @@ -47,10 +46,9 @@ public final class ContractRouter extends ChaincodeBase { private final ExecutionService executor; /** - * Take the arguments from the cli, and initiate processing of cli options and - * environment variables. + * Take the arguments from the cli, and initiate processing of cli options and environment variables. * - * Create the Contract scanner, and the Execution service + *

Create the Contract scanner, and the Execution service * * @param args */ @@ -81,9 +79,7 @@ public ContractRouter(final String[] args) { executor = ExecutionFactory.getInstance().createExecutionService(serializers); } - /** - * Locate all the contracts that are available on the classpath. - */ + /** Locate all the contracts that are available on the classpath. */ protected void findAllContracts() { registry.findAndSetContracts(this.typeRegistry); } @@ -91,7 +87,7 @@ protected void findAllContracts() { /** * Start the chaincode container off and running. * - * This will send the initial flow back to the peer + *

This will send the initial flow back to the peer * * @throws Exception */ @@ -169,8 +165,7 @@ public static void main(final String[] args) throws Exception { // check if this should be running in client or server mode if (cfc.isServer()) { logger.info("Starting chaincode as server"); - ChaincodeServer chaincodeServer = new NettyChaincodeServer(cfc, - cfc.getChaincodeServerConfig()); + ChaincodeServer chaincodeServer = new NettyChaincodeServer(cfc, cfc.getChaincodeServerConfig()); chaincodeServer.start(); } else { logger.info("Starting chaincode as client"); @@ -201,5 +196,4 @@ public void startRouterWithChaincodeServer(final ChaincodeServer chaincodeServer chaincodeServer.start(); } - } diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractRuntimeException.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractRuntimeException.java index 0fca449f..b51c218f 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractRuntimeException.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractRuntimeException.java @@ -8,25 +8,19 @@ import org.hyperledger.fabric.shim.ChaincodeException; /** - * Specific RuntimeException for events that occur in the calling and handling - * of the Contracts, NOT within the contract logic itself. - *

- * FUTURE At some future point we wish to add more diagnostic information - * into this, for example current tx id + * Specific RuntimeException for events that occur in the calling and handling of the Contracts, NOT within the contract + * logic itself. * + *

FUTURE At some future point we wish to add more diagnostic information into this, for example current tx id */ public class ContractRuntimeException extends ChaincodeException { - /** - * - * @param string - */ + /** @param string */ public ContractRuntimeException(final String string) { super(string); } /** - * * @param string * @param cause */ @@ -34,17 +28,11 @@ public ContractRuntimeException(final String string, final Throwable cause) { super(string, cause); } - /** - * - * @param cause - */ + /** @param cause */ public ContractRuntimeException(final Throwable cause) { super(cause); } - /** - * Generated serial version id. - */ + /** Generated serial version id. */ private static final long serialVersionUID = -884373036398750450L; - } diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Contact.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Contact.java index c344b37b..fb3e2fc9 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Contact.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Contact.java @@ -12,27 +12,19 @@ import java.lang.annotation.Target; /** - * Class level annotation that identifies this class as being a contact. Can be - * populated with email, name and url fields. - * + * Class level annotation that identifies this class as being a contact. Can be populated with email, name and url + * fields. */ @Retention(RUNTIME) @Target(ElementType.TYPE) public @interface Contact { - /** - * @return String - */ + /** @return String */ String email() default ""; - /** - * @return String - */ + /** @return String */ String name() default ""; - /** - * @return String - */ + /** @return String */ String url() default ""; - } diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Contract.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Contract.java index d28987b2..8114170e 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Contract.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Contract.java @@ -12,19 +12,17 @@ import java.lang.annotation.Target; /** - * Class level annotation that identifies this class as being a contract. Can - * supply information and an alternative name for the contract rather than the - * classname + * Class level annotation that identifies this class as being a contract. Can supply information and an alternative name + * for the contract rather than the classname */ @Retention(RUNTIME) @Target(ElementType.TYPE) public @interface Contract { /** - * The Info object can be supplied to provide additional information about the - * contract. + * The Info object can be supplied to provide additional information about the contract. * - * Including title, description, version and license + *

Including title, description, version and license * * @return Info object */ @@ -33,8 +31,8 @@ /** * Contract name. * - * Normally the name of the class is used to refer to the contract (name without - * package). This can be altered if wished. + *

Normally the name of the class is used to refer to the contract (name without package). This can be altered if + * wished. * * @return Name of the contract to be used instead of the Classname */ @@ -43,14 +41,12 @@ /** * Transaction Serializer Classname. * - * Fully Qualified Classname of the TRANSACTION serializer that should be used - * with this contract. + *

Fully Qualified Classname of the TRANSACTION serializer that should be used with this contract. * - * This is the serializer that is used to parse incoming transaction request - * parameters and convert the return type + *

This is the serializer that is used to parse incoming transaction request parameters and convert the return + * type * * @return Default serializer classname */ String transactionSerializer() default "org.hyperledger.fabric.contract.execution.JSONTransactionSerializer"; - } diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/DataType.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/DataType.java index 8799198d..a671fcf0 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/DataType.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/DataType.java @@ -12,18 +12,15 @@ import java.lang.annotation.Target; /** - * Class level annotation indicating this class represents one of the complex - * types that can be returned or passed to the transaction functions. - *

- * These datatypes are used (within the current implementation) for determining - * the data flow protocol from the Contracts to the SDK and for permitting a - * fully formed Interface Definition to be created for the contract. - *

- * Complex types can appear within this definition, and these are identified - * using this annotation. - *

- * FUTURE To take these annotations are also utilize them for leverage - * storage + * Class level annotation indicating this class represents one of the complex types that can be returned or passed to + * the transaction functions. + * + *

These datatypes are used (within the current implementation) for determining the data flow protocol from the + * Contracts to the SDK and for permitting a fully formed Interface Definition to be created for the contract. + * + *

Complex types can appear within this definition, and these are identified using this annotation. + * + *

FUTURE To take these annotations are also utilize them for leverage storage */ @Retention(RUNTIME) @Target(ElementType.TYPE) diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Default.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Default.java index 683ba668..f289e56a 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Default.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Default.java @@ -14,11 +14,9 @@ /** * Default Contract. * - * Class level annotation that defines the contract that is the default - * contract, and as such invoke of the transaction functions does not need to be - * qualified by the contract name + *

Class level annotation that defines the contract that is the default contract, and as such invoke of the + * transaction functions does not need to be qualified by the contract name */ @Retention(RUNTIME) @Target(ElementType.TYPE) -public @interface Default { -} +public @interface Default {} diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Info.java index 8b1d05fd..17d02e16 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Info.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Info.java @@ -15,41 +15,29 @@ /** * Info Details * - * - * Class level annotation that identifies this class as being an info object. - * Can supply additional information about the contract, including title, - * description, version, license and contact information. - * + *

Class level annotation that identifies this class as being an info object. Can supply additional information about + * the contract, including title, description, version, license and contact information. */ @Retention(RUNTIME) @Target(ElementType.TYPE) public @interface Info { - /** - * @return String - */ + /** @return String */ String title() default ""; - /** - * @return String - */ + /** @return String */ String description() default ""; - /** - * @return String - */ + /** @return String */ String version() default ""; - /** - * @return String - */ + /** @return String */ String termsOfService() default ""; /** * License object that can be populated to include name and url. * * @return License object - * */ License license() default @License(); @@ -57,8 +45,6 @@ * Contact object that can be populated with email, name and url fields. * * @return Contact object - * */ Contact contact() default @Contact(); - } diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/License.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/License.java index 88989f02..a585f634 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/License.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/License.java @@ -12,24 +12,16 @@ import java.lang.annotation.Target; /** - * Class level annotation that identifies this class as being a license object. - * Can be populated to include name and url. - * + * Class level annotation that identifies this class as being a license object. Can be populated to include name and + * url. */ @Retention(RUNTIME) @Target(ElementType.TYPE) public @interface License { - /** - * - * @return String - */ + /** @return String */ String name() default ""; - /** - * - * @return String - */ + /** @return String */ String url() default ""; - } diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Property.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Property.java index 1b75fffb..5a94e8dc 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Property.java +++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Property.java @@ -14,10 +14,9 @@ /** * Field and parameter level annotation defining a property of the class. * - * (identified by {@link DataType}) Can also be used on the parameters of - * transaction functions - *

- * Example of using this annotation + *

(identified by {@link DataType}) Can also be used on the parameters of transaction functions + * + *

Example of using this annotation * * 

  *
@@ -36,9 +35,8 @@
 public @interface Property {
 
     /**
-     * Allows each property to be defined a detail set of rules to determine the
-     * valid types of this data. The format follows the syntax of the OpenAPI Schema
-     * object.
+     * Allows each property to be defined a detail set of rules to determine the valid types of this data. The format
+     * follows the syntax of the OpenAPI Schema object.
      *
      * @return String array of the key-value pairs of the schema
      */
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Serializer.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Serializer.java
index 10ff45d6..37d91fc9 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Serializer.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Serializer.java
@@ -12,32 +12,22 @@
 import java.lang.annotation.Target;
 
 /**
- * Class level annotation that defines the serializer that should be used to
- * convert objects to and from the wire format.
+ * Class level annotation that defines the serializer that should be used to convert objects to and from the wire
+ * format.
  *
- * 
This should annotate a class that implements the Serializer interface

+ * 
This should annotate a class that implements the Serializer interface
  */
 @Retention(RUNTIME)
 @Target({ElementType.TYPE, ElementType.TYPE_USE})
 public @interface Serializer {
-    /**
-     * What is this serializer able to target?
-     *
-     */
+    /** What is this serializer able to target? */
     enum TARGET {
-        /**
-         * Target transaction functions.
-         */
+        /** Target transaction functions. */
         TRANSACTION,
-        /**
-         * Target all elements.
-         */
+        /** Target all elements. */
         ALL
     }
 
-    /**
-     *
-     * @return Target of the serializer
-     */
+    /** @return Target of the serializer */
     TARGET target() default Serializer.TARGET.ALL;
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Transaction.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Transaction.java
index c9180ca4..3f41e3fb 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Transaction.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Transaction.java
@@ -12,44 +12,35 @@
 import java.lang.annotation.Target;
 
 /**
- * Method level annotation indicating the method to be a callable transaction
- * function.
- * 

- * These functions are called in client SDKs by the combination of
+ * Method level annotation indicating the method to be a callable transaction function.
+ *
+ * 
These functions are called in client SDKs by the combination of
  *
  * 
  *  [contractname]:[transactioname]
  * 

  *
- * Unless specified otherwise, the contract name is the class name (without
- * package) and the transaction name is the method name.
+ * Unless specified otherwise, the contract name is the class name (without package) and the transaction name is the
+ * method name.
  */
 @Retention(RUNTIME)
 @Target(METHOD)
 public @interface Transaction {
 
-    /**
-     * The intended invocation style for a transaction function.
-     */
+    /** The intended invocation style for a transaction function. */
     enum TYPE {
-        /**
-         * Transaction is used to submit updates to the ledger.
-         */
+        /** Transaction is used to submit updates to the ledger. */
         SUBMIT,
-        /**
-         * Transaction is evaluated to query information from the ledger.
-         */
+        /** Transaction is evaluated to query information from the ledger. */
         EVALUATE
     }
 
     /**
      * Submit semantics.
      *
-     * 
TRUE indicates that this function is intended to be called with the 'submit'
-     * semantics

+     * 
TRUE indicates that this function is intended to be called with the 'submit' semantics
      *
-     * 
FALSE indicates that this is intended to be called with the evaluate
-     * semantics

+     * 
FALSE indicates that this is intended to be called with the evaluate semantics
      *
      * @return boolean, default is true
      * @deprecated Please use intent
@@ -59,19 +50,20 @@ enum TYPE {
 
     /**
      * What are submit semantics for this transaction.
+     *
      * 

-     * 
SUBMIT
indicates that this function is intended to be called with the
-     * 'submit' semantics

-     * 
EVALUATE
indicates that this is intended to be called
-     * with the 'evaluate' semantics

+     *   
SUBMIT
+     *   
indicates that this function is intended to be called with the 'submit' semantics
+     *   
EVALUATE
+     *   
indicates that this is intended to be called with the 'evaluate' semantics
      * 

+     *
      * @return submit semantics
      */
     TYPE intent() default Transaction.TYPE.SUBMIT;
 
     /**
-     * The name of the callable transaction if it should be different to the method
-     * name.
+     * The name of the callable transaction if it should be different to the method name.
      *
      * @return the transaction name
      */
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/ExecutionFactory.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/ExecutionFactory.java
index 0d437c5e..fee47eb1 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/ExecutionFactory.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/ExecutionFactory.java
@@ -14,9 +14,7 @@
 public class ExecutionFactory {
     private static ExecutionFactory rf;
 
-    /**
-     * @return ExecutionFactory
-     */
+    /** @return ExecutionFactory */
     public static ExecutionFactory getInstance() {
         if (rf == null) {
             rf = new ExecutionFactory();
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/ExecutionService.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/ExecutionService.java
index ef0b9719..8c859680 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/ExecutionService.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/ExecutionService.java
@@ -13,13 +13,11 @@
 /**
  * ExecutionService.
  *
- * Service that executes {@link InvocationRequest} (wrapped Init/Invoke + extra
- * data) using routing information
+ * 
Service that executes {@link InvocationRequest} (wrapped Init/Invoke + extra data) using routing information
  */
 public interface ExecutionService {
 
     /**
-     *
      * @param txFn
      * @param req
      * @param stub
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/InvocationRequest.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/InvocationRequest.java
index 6978e037..92c478c1 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/InvocationRequest.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/InvocationRequest.java
@@ -11,33 +11,21 @@
 /**
  * Invocation Request.
  *
- * All information needed to find
- * {@link org.hyperledger.fabric.contract.annotation.Contract} and invoke the
- * request.
+ * 
All information needed to find {@link org.hyperledger.fabric.contract.annotation.Contract} and invoke the request.
  */
 public interface InvocationRequest {
-    /**
-     *
-     */
+    /** */
     String DEFAULT_NAMESPACE = "default";
 
-    /**
-     * @return Namespace
-     */
+    /** @return Namespace */
     String getNamespace();
 
-    /**
-     * @return Method
-     */
+    /** @return Method */
     String getMethod();
 
-    /**
-     * @return Args as byte array
-     */
+    /** @return Args as byte array */
     List getArgs();
 
-    /**
-     * @return Request
-     */
+    /** @return Request */
     String getRequestName();
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/JSONTransactionSerializer.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/JSONTransactionSerializer.java
index c7633e53..c1c99591 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/JSONTransactionSerializer.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/JSONTransactionSerializer.java
@@ -15,7 +15,6 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-
 import org.hyperledger.fabric.Logger;
 import org.hyperledger.fabric.contract.ContractRuntimeException;
 import org.hyperledger.fabric.contract.annotation.Serializer;
@@ -27,19 +26,14 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-/**
- * Used as a the default serialisation for transmission from SDK to Contract.
- */
+/** Used as a the default serialisation for transmission from SDK to Contract. */
 @Serializer()
 public class JSONTransactionSerializer implements SerializerInterface {
     private static Logger logger = Logger.getLogger(JSONTransactionSerializer.class.getName());
     private final TypeRegistry typeRegistry = TypeRegistry.getRegistry();
 
-    /**
-     * Create a new serialiser.
-     */
-    public JSONTransactionSerializer() {
-    }
+    /** Create a new serialiser. */
+    public JSONTransactionSerializer() {}
 
     /**
      * Convert the value supplied to a byte array, according to the TypeSchema.
@@ -56,23 +50,23 @@ public byte[] toBuffer(final Object value, final TypeSchema ts) {
             final String type = ts.getType();
             if (type != null) {
                 switch (type) {
-                case "array":
-                    final JSONArray array = normalizeArray(new JSONArray(value), ts);
-                    buffer = array.toString().getBytes(UTF_8);
-                    break;
-                case "string":
-                    final String format = ts.getFormat();
-                    if (format != null && format.contentEquals("uint16")) {
-                        buffer = Character.valueOf((char) value).toString().getBytes(UTF_8);
-                    } else {
-                        buffer = ((String) value).getBytes(UTF_8);
-                    }
-                    break;
-                case "number":
-                case "integer":
-                case "boolean":
-                default:
-                    buffer = (value).toString().getBytes(UTF_8);
+                    case "array":
+                        final JSONArray array = normalizeArray(new JSONArray(value), ts);
+                        buffer = array.toString().getBytes(UTF_8);
+                        break;
+                    case "string":
+                        final String format = ts.getFormat();
+                        if (format != null && format.contentEquals("uint16")) {
+                            buffer = Character.valueOf((char) value).toString().getBytes(UTF_8);
+                        } else {
+                            buffer = ((String) value).getBytes(UTF_8);
+                        }
+                        break;
+                    case "number":
+                    case "integer":
+                    case "boolean":
+                    default:
+                        buffer = (value).toString().getBytes(UTF_8);
                 }
             } else {
                 // at this point we can assert that the value is
@@ -102,14 +96,13 @@ public byte[] toBuffer(final Object value, final TypeSchema ts) {
     /**
      * Normalize the Array.
      *
-     * We need to take the JSON array, and if there are complex datatypes within it
-     * ensure that they don't get spurious JSON properties appearing
+     * 
We need to take the JSON array, and if there are complex datatypes within it ensure that they don't get
+     * spurious JSON properties appearing
      *
-     * This method needs to be general so has to copy with nested arrays and with
-     * primitive and Object types
+     * 
This method needs to be general so has to copy with nested arrays and with primitive and Object types
      *
      * @param jsonArray incoming array
-     * @param ts        Schema to normalise to
+     * @param ts Schema to normalise to
      * @return JSONArray
      */
     private JSONArray normalizeArray(final JSONArray jsonArray, final TypeSchema ts) {
@@ -143,7 +136,6 @@ private JSONArray normalizeArray(final JSONArray jsonArray, final TypeSchema ts)
                 final JSONObject obj = new JSONObject(jsonArray.getJSONObject(i), propNames);
                 normalizedArray.put(i, obj);
             }
-
         }
         return normalizedArray;
     }
@@ -152,8 +144,7 @@ private JSONArray normalizeArray(final JSONArray jsonArray, final TypeSchema ts)
      * Take the byte buffer and return the object as required.
      *
      * @param buffer Byte buffer from the wire
-     * @param ts     TypeSchema representing the type
-     *
+     * @param ts TypeSchema representing the type
      * @return Object created; relies on Java auto-boxing for primitives
      */
     @Override
@@ -172,11 +163,10 @@ public Object fromBuffer(final byte[] buffer, final TypeSchema ts) {
     }
 
     /**
-     * We need to be able to map between the primative class types and the object
-     * variants. In the case where this is needed Java auto-boxing doesn't actually
-     * help.
+     * We need to be able to map between the primative class types and the object variants. In the case where this is
+     * needed Java auto-boxing doesn't actually help.
      *
-     * For other types the parameter is passed directly back
+     * 
For other types the parameter is passed directly back
      *
      * @param primitive class for the primitive
      * @return Class for the Object variant
@@ -191,31 +181,32 @@ private Class mapPrimitive(final Class primitive) {
         }
 
         switch (primitiveType) {
-        case "int":
-            return isArray ? Integer[].class : Integer.class;
-        case "long":
-            return isArray ? Long[].class : Long.class;
-        case "float":
-            return isArray ? Float[].class : Float.class;
-        case "double":
-            return isArray ? Double[].class : Double.class;
-        case "short":
-            return isArray ? Short[].class : Short.class;
-        case "byte":
-            return isArray ? Byte[].class : Byte.class;
-        case "char":
-            return isArray ? Character[].class : Character.class;
-        case "boolean":
-            return isArray ? Boolean[].class : Boolean.class;
-        default:
-            return primitive;
+            case "int":
+                return isArray ? Integer[].class : Integer.class;
+            case "long":
+                return isArray ? Long[].class : Long.class;
+            case "float":
+                return isArray ? Float[].class : Float.class;
+            case "double":
+                return isArray ? Double[].class : Double.class;
+            case "short":
+                return isArray ? Short[].class : Short.class;
+            case "byte":
+                return isArray ? Byte[].class : Byte.class;
+            case "char":
+                return isArray ? Character[].class : Character.class;
+            case "boolean":
+                return isArray ? Boolean[].class : Boolean.class;
+            default:
+                return primitive;
         }
     }
 
     /*
      * Internal method to do the conversion
      */
-    private Object convert(final String stringData, final TypeSchema ts) throws IllegalArgumentException, IllegalAccessException, InstantiationException {
+    private Object convert(final String stringData, final TypeSchema ts)
+            throws IllegalArgumentException, IllegalAccessException, InstantiationException {
         logger.debug(() -> "Schema to convert is " + ts);
         String type = ts.getType();
         String format = null;
@@ -236,20 +227,20 @@ private Object convert(final String stringData, final TypeSchema ts) throws Ille
         } else if (type.contentEquals("integer")) {
             final String intFormat = ts.getFormat();
             switch (intFormat) {
-            case "int32":
-                value = Integer.parseInt(stringData);
-                break;
-            case "int8":
-                value = Byte.parseByte(stringData);
-                break;
-            case "int16":
-                value = Short.parseShort(stringData);
-                break;
-            case "int64":
-                value = Long.parseLong(stringData);
-                break;
-            default:
-                throw new RuntimeException("Unknown format for integer " + intFormat);
+                case "int32":
+                    value = Integer.parseInt(stringData);
+                    break;
+                case "int8":
+                    value = Byte.parseByte(stringData);
+                    break;
+                case "int16":
+                    value = Short.parseShort(stringData);
+                    break;
+                case "int64":
+                    value = Long.parseLong(stringData);
+                    break;
+                default:
+                    throw new RuntimeException("Unknown format for integer " + intFormat);
             }
 
         } else if (type.contentEquals("number")) {
@@ -268,13 +259,13 @@ private Object convert(final String stringData, final TypeSchema ts) throws Ille
             final TypeSchema itemSchema = ts.getItems();
 
             // note here that the type has to be converted in the case of primitives
-            final Object[] data = (Object[]) Array.newInstance(mapPrimitive(itemSchema.getTypeClass(this.typeRegistry)), jsonArray.length());
+            final Object[] data = (Object[])
+                    Array.newInstance(mapPrimitive(itemSchema.getTypeClass(this.typeRegistry)), jsonArray.length());
             for (int i = 0; i < jsonArray.length(); i++) {
                 final Object convertedData = convert(jsonArray.get(i).toString(), itemSchema);
                 data[i] = convertedData;
             }
             value = data;
-
         }
         return value;
     }
@@ -282,9 +273,9 @@ private Object convert(final String stringData, final TypeSchema ts) throws Ille
     /**
      * Create new instance of the specificied object from the supplied JSON String.
      *
-     * @param format     Details of the format needed
+     * @param format Details of the format needed
      * @param jsonString JSON string
-     * @param ts         TypeSchema
+     * @param ts TypeSchema
      * @return new object
      */
     Object createComponentInstance(final String format, final String jsonString, final TypeSchema ts) {
@@ -293,7 +284,10 @@ Object createComponentInstance(final String format, final String jsonString, fin
         Object obj;
         try {
             obj = dtd.getTypeClass().getDeclaredConstructor().newInstance();
-        } catch (IllegalAccessException | InstantiationException | InvocationTargetException | NoSuchMethodException e1) {
+        } catch (IllegalAccessException
+                | InstantiationException
+                | InvocationTargetException
+                | NoSuchMethodException e1) {
             throw new ContractRuntimeException("Unable to to create new instance of type", e1);
         }
 
@@ -302,7 +296,7 @@ Object createComponentInstance(final String format, final String jsonString, fin
         ts.validate(json);
         try {
             final Map fields = dtd.getProperties();
-            for (final Iterator iterator = fields.values().iterator(); iterator.hasNext();) {
+            for (final Iterator iterator = fields.values().iterator(); iterator.hasNext(); ) {
                 final PropertyDefinition prop = iterator.next();
 
                 final Field f = prop.getField();
@@ -310,12 +304,14 @@ Object createComponentInstance(final String format, final String jsonString, fin
                 final Object newValue = convert(json.get(prop.getName()).toString(), prop.getSchema());
 
                 f.set(obj, newValue);
-
             }
             return obj;
-        } catch (SecurityException | IllegalArgumentException | IllegalAccessException | InstantiationException | JSONException e) {
+        } catch (SecurityException
+                | IllegalArgumentException
+                | IllegalAccessException
+                | InstantiationException
+                | JSONException e) {
             throw new ContractRuntimeException("Unable to convert JSON to object", e);
         }
-
     }
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/SerializerInterface.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/SerializerInterface.java
index ed5cc584..f52d87d0 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/SerializerInterface.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/SerializerInterface.java
@@ -9,15 +9,13 @@
 import org.hyperledger.fabric.contract.metadata.TypeSchema;
 
 /**
- * This interface allows contract developers to change the serialization
- * mechanism. There are two scenarios where instances of DataTypes are
- * serialized.
+ * This interface allows contract developers to change the serialization mechanism. There are two scenarios where
+ * instances of DataTypes are serialized.
  *
- * When the objects are (logically) transferred from the Client application to
- * the Contract resulting in a transaction function being invoked. Typically this
- * is JSON, hence a default JSON parser is provided.
+ * 
When the objects are (logically) transferred from the Client application to the Contract resulting in a
+ * transaction function being invoked. Typically this is JSON, hence a default JSON parser is provided.
  *
- * The JSONTransactionSerializer can be extended if needed
+ * 
The JSONTransactionSerializer can be extended if needed
  */
 public interface SerializerInterface {
 
@@ -34,10 +32,8 @@ public interface SerializerInterface {
      * Take the byte buffer and return the object as required.
      *
      * @param buffer Byte buffer from the wire
-     * @param ts     TypeSchema representing the type
-     *
+     * @param ts TypeSchema representing the type
      * @return Object created; relies on Java auto-boxing for primitives
      */
     Object fromBuffer(byte[] buffer, TypeSchema ts);
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/impl/ContractExecutionService.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/impl/ContractExecutionService.java
index e9611107..b8803269 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/impl/ContractExecutionService.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/impl/ContractExecutionService.java
@@ -6,7 +6,11 @@
 
 package org.hyperledger.fabric.contract.execution.impl;
 
- import org.hyperledger.fabric.contract.Context;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+import org.hyperledger.fabric.contract.Context;
 import org.hyperledger.fabric.contract.ContractInterface;
 import org.hyperledger.fabric.contract.ContractRuntimeException;
 import org.hyperledger.fabric.contract.annotation.Serializer;
@@ -22,29 +26,21 @@
 import org.hyperledger.fabric.shim.ChaincodeStub;
 import org.hyperledger.fabric.shim.ResponseUtils;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
 public class ContractExecutionService implements ExecutionService {
 
     private static Logger logger = Logger.getLogger(ContractExecutionService.class.getName());
 
     private final SerializerRegistryImpl serializers;
 
-    /**
-     * @param serializers
-     */
+    /** @param serializers */
     public ContractExecutionService(final SerializerRegistryImpl serializers) {
         this.serializers = serializers;
     }
 
-    /**
-     *
-     */
+    /** */
     @Override
-    public Chaincode.Response executeRequest(final TxFunction txFn, final InvocationRequest req, final ChaincodeStub stub) {
+    public Chaincode.Response executeRequest(
+            final TxFunction txFn, final InvocationRequest req, final ChaincodeStub stub) {
         logger.fine(() -> "Routing Request" + txFn);
         final TxFunction.Routing rd = txFn.getRouting();
         Chaincode.Response response;
@@ -83,21 +79,22 @@ public Chaincode.Response executeRequest(final TxFunction txFn, final Invocation
     }
 
     private byte[] convertReturn(final Object obj, final TxFunction txFn) {
-        final SerializerInterface serializer = serializers.getSerializer(
-                txFn.getRouting().getSerializerName(), Serializer.TARGET.TRANSACTION);
+        final SerializerInterface serializer =
+                serializers.getSerializer(txFn.getRouting().getSerializerName(), Serializer.TARGET.TRANSACTION);
         final TypeSchema ts = txFn.getReturnSchema();
         return serializer.toBuffer(obj, ts);
     }
 
     private List convertArgs(final List stubArgs, final TxFunction txFn) {
-        final SerializerInterface serializer = serializers.getSerializer(
-                txFn.getRouting().getSerializerName(), Serializer.TARGET.TRANSACTION);
+        final SerializerInterface serializer =
+                serializers.getSerializer(txFn.getRouting().getSerializerName(), Serializer.TARGET.TRANSACTION);
         final List schemaParams = txFn.getParamsList();
         final List args = new ArrayList<>(stubArgs.size() + 1); // allow for context as the first argument
         for (int i = 0; i < schemaParams.size(); i++) {
-            args.add(i, serializer.fromBuffer(stubArgs.get(i), schemaParams.get(i).getSchema()));
+            args.add(
+                    i,
+                    serializer.fromBuffer(stubArgs.get(i), schemaParams.get(i).getSchema()));
         }
         return args;
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/impl/ContractInvocationRequest.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/impl/ContractInvocationRequest.java
index a2b9d9e9..a63d2ffc 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/impl/ContractInvocationRequest.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/impl/ContractInvocationRequest.java
@@ -9,7 +9,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hyperledger.fabric.contract.execution.InvocationRequest;
@@ -22,11 +21,10 @@ public class ContractInvocationRequest implements InvocationRequest {
 
     private static Log logger = LogFactory.getLog(ContractInvocationRequest.class);
 
-    /**
-     * @param context
-     */
+    /** @param context */
     public ContractInvocationRequest(final ChaincodeStub context) {
-        final String func = context.getStringArgs().size() > 0 ? context.getStringArgs().get(0) : null;
+        final String func =
+                context.getStringArgs().size() > 0 ? context.getStringArgs().get(0) : null;
         final String[] funcParts = func.split(":");
         logger.debug(func);
         if (funcParts.length == 2) {
@@ -41,44 +39,33 @@ public ContractInvocationRequest(final ChaincodeStub context) {
         logger.debug(namespace + " " + method + " " + args);
     }
 
-    /**
-     *
-     */
+    /** */
     @Override
     public String getNamespace() {
         return namespace;
     }
 
-    /**
-     *
-     */
+    /** */
     @Override
     public String getMethod() {
         return method;
     }
 
-    /**
-     *
-     */
+    /** */
     @Override
     public List getArgs() {
         return args;
     }
 
-    /**
-     *
-     */
+    /** */
     @Override
     public String getRequestName() {
         return namespace + ":" + method;
     }
 
-    /**
-     *
-     */
+    /** */
     @Override
     public String toString() {
         return namespace + ":" + method + " @" + Integer.toHexString(System.identityHashCode(this));
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/impl/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/impl/package-info.java
index dd93d90a..b708841f 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/impl/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/impl/package-info.java
@@ -4,7 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- *
- */
+/** */
 package org.hyperledger.fabric.contract.execution.impl;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/package-info.java
index 2c9651ad..4fa00279 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/package-info.java
@@ -4,7 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- *
- */
+/** */
 package org.hyperledger.fabric.contract.execution;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/MetadataBuilder.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/MetadataBuilder.java
index 6b1830db..c7b5d0c0 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/MetadataBuilder.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/MetadataBuilder.java
@@ -17,7 +17,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
-
 import org.everit.json.schema.Schema;
 import org.everit.json.schema.ValidationException;
 import org.everit.json.schema.loader.SchemaClient;
@@ -37,17 +36,14 @@
 
 /**
  * Builder to assist in production of the metadata.
- * 

- * This class is used to build up the JSON structure to be returned as the
- * metadata It is not a store of information, rather a set of functional data to
- * process to and from metadata json to the internal data structure
+ *
+ * 
This class is used to build up the JSON structure to be returned as the metadata It is not a store of information,
+ * rather a set of functional data to process to and from metadata json to the internal data structure
  */
 public final class MetadataBuilder {
     private static Logger logger = Logger.getLogger(MetadataBuilder.class);
 
-    private MetadataBuilder() {
-
-    }
+    private MetadataBuilder() {}
 
     @SuppressWarnings("serial")
     static class MetadataMap extends HashMap {
@@ -83,8 +79,11 @@ public static void validate() {
                 InputStream jsonSchemaInputStream = cl.getResourceAsStream("json-schema-draft-04-schema.json")) {
             final JSONObject rawContractSchema = new JSONObject(new JSONTokener(contractSchemaInputStream));
             final JSONObject rawJsonSchema = new JSONObject(new JSONTokener(jsonSchemaInputStream));
-            final SchemaLoader schemaLoader = SchemaLoader.builder().schemaClient(schemaClient).schemaJson(rawContractSchema)
-                    .registerSchemaByURI(URI.create("http://json-schema.org/draft-04/schema"), rawJsonSchema).build();
+            final SchemaLoader schemaLoader = SchemaLoader.builder()
+                    .schemaClient(schemaClient)
+                    .schemaJson(rawContractSchema)
+                    .registerSchemaByURI(URI.create("http://json-schema.org/draft-04/schema"), rawJsonSchema)
+                    .build();
             final Schema schema = schemaLoader.load().build();
             schema.validate(metadata());
 
@@ -92,17 +91,18 @@ public static void validate() {
             throw new RuntimeException(e);
         } catch (final ValidationException e) {
             logger.error(e.getMessage());
-            e.getCausingExceptions().stream().map(ValidationException::getMessage).forEach(logger::info);
+            e.getCausingExceptions().stream()
+                    .map(ValidationException::getMessage)
+                    .forEach(logger::info);
             logger.error(debugString());
             throw e;
         }
-
     }
 
     /**
      * Setup the metadata from the found contracts.
      *
-     * @param registry     RoutingRegistry
+     * @param registry RoutingRegistry
      * @param typeRegistry TypeRegistry
      */
     public static void initialize(final RoutingRegistry registry, final TypeRegistry typeRegistry) {
@@ -117,7 +117,6 @@ public static void initialize(final RoutingRegistry registry, final TypeRegistry
         // check
         logger.info("Validating schema created");
         MetadataBuilder.validate();
-
     }
 
     /**
@@ -195,7 +194,7 @@ public static String addContract(final ContractDefinition contractDefinition) {
     /**
      * Adds a new transaction function to the metadata for the given contract.
      *
-     * @param txFunction   Object representing the transaction function
+     * @param txFunction Object representing the transaction function
      * @param contractName Name of the contract that this function belongs to
      */
     public static void addTransaction(final TxFunction txFunction, final String contractName) {
@@ -270,10 +269,7 @@ private static JSONObject metadata() {
         return joMetadata;
     }
 
-    /**
-     *
-     * @return All the components indexed by name
-     */
+    /** @return All the components indexed by name */
     public static Map getComponents() {
         return componentMap;
     }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/TypeSchema.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/TypeSchema.java
index 213fb83d..79453428 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/TypeSchema.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/TypeSchema.java
@@ -9,7 +9,6 @@
 import java.lang.reflect.Array;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.everit.json.schema.Schema;
 import org.everit.json.schema.ValidationException;
 import org.everit.json.schema.loader.SchemaLoader;
@@ -19,24 +18,18 @@
 import org.json.JSONObject;
 
 /**
- *
  * TypeSchema.
  *
- * Custom sub-type of Map that helps with the case where if there's no value
- * then do not insert the property at all
+ * 
Custom sub-type of Map that helps with the case where if there's no value then do not insert the property at all
  *
- * Does not include the "schema" top level map
+ * 
Does not include the "schema" top level map
  */
 @SuppressWarnings("serial")
 public final class TypeSchema extends HashMap {
     private static Logger logger = Logger.getLogger(TypeSchema.class.getName());
 
-    /**
-     *
-     */
-    public TypeSchema() {
-
-    }
+    /** */
+    public TypeSchema() {}
 
     private Object putInternal(final String key, final Object value) {
         if (value != null && !value.toString().isEmpty()) {
@@ -62,10 +55,7 @@ TypeSchema[] putIfNotNull(final String key, final TypeSchema[] value) {
         return (TypeSchema[]) this.putInternal(key, value);
     }
 
-    /**
-     *
-     * @return Return Type String
-     */
+    /** @return Return Type String */
     public String getType() {
         if (this.containsKey("schema")) {
             final Map intermediateMap = (Map) this.get("schema");
@@ -74,10 +64,7 @@ public String getType() {
         return (String) this.get("type");
     }
 
-    /**
-     *
-     * @return TypeSchema items
-     */
+    /** @return TypeSchema items */
     public TypeSchema getItems() {
         if (this.containsKey("schema")) {
             final Map intermediateMap = (Map) this.get("schema");
@@ -86,23 +73,16 @@ public TypeSchema getItems() {
         return (TypeSchema) this.get("items");
     }
 
-    /**
-     *
-     * @return Reference
-     */
+    /** @return Reference */
     public String getRef() {
         if (this.containsKey("schema")) {
             final Map intermediateMap = (Map) this.get("schema");
             return (String) intermediateMap.get("$ref");
         }
         return (String) this.get("$ref");
-
     }
 
-    /**
-     *
-     * @return Format
-     */
+    /** @return Format */
     public String getFormat() {
         if (this.containsKey("schema")) {
             final Map intermediateMap = (Map) this.get("schema");
@@ -112,7 +92,6 @@ public String getFormat() {
     }
 
     /**
-     *
      * @param typeRegistry
      * @return Class object
      */
@@ -135,33 +114,33 @@ public Class getTypeClass(final TypeRegistry typeRegistry) {
             // need to check the format
             final String format = getFormat();
             switch (format) {
-            case "int8":
-                clz = byte.class;
-                break;
-            case "int16":
-                clz = short.class;
-                break;
-            case "int32":
-                clz = int.class;
-                break;
-            case "int64":
-                clz = long.class;
-                break;
-            default:
-                throw new RuntimeException("Unknown format for integer of " + format);
+                case "int8":
+                    clz = byte.class;
+                    break;
+                case "int16":
+                    clz = short.class;
+                    break;
+                case "int32":
+                    clz = int.class;
+                    break;
+                case "int64":
+                    clz = long.class;
+                    break;
+                default:
+                    throw new RuntimeException("Unknown format for integer of " + format);
             }
         } else if (type.contentEquals("number")) {
             // need to check the format
             final String format = getFormat();
             switch (format) {
-            case "double":
-                clz = double.class;
-                break;
-            case "float":
-                clz = float.class;
-                break;
-            default:
-                throw new RuntimeException("Unknown format for number of " + format);
+                case "double":
+                    clz = double.class;
+                    break;
+                case "float":
+                    clz = float.class;
+                    break;
+                default:
+                    throw new RuntimeException("Unknown format for number of " + format);
             }
         } else if (type.contentEquals("boolean")) {
             clz = boolean.class;
@@ -183,7 +162,6 @@ public Class getTypeClass(final TypeRegistry typeRegistry) {
      *
      * @param clz
      * @return TypeSchema
-     *
      */
     public static TypeSchema typeConvert(final Class clz) {
         final TypeSchema returnschema = new TypeSchema();
@@ -213,61 +191,60 @@ public static TypeSchema typeConvert(final Class clz) {
         }
 
         switch (className) {
-        case "java.lang.String":
-            schema.put("type", "string");
-            break;
-        case "char":
-        case "java.lang.Character":
-            schema.put("type", "string");
-            schema.put("format", "uint16");
-            break;
-        case "byte":
-        case "java.lang.Byte":
-            schema.put("type", "integer");
-            schema.put("format", "int8");
-            break;
-        case "short":
-        case "java.lang.Short":
-            schema.put("type", "integer");
-            schema.put("format", "int16");
-            break;
-        case "int":
-        case "java.lang.Integer":
-            schema.put("type", "integer");
-            schema.put("format", "int32");
-            break;
-        case "long":
-        case "java.lang.Long":
-            schema.put("type", "integer");
-            schema.put("format", "int64");
-            break;
-        case "double":
-        case "java.lang.Double":
-            schema.put("type", "number");
-            schema.put("format", "double");
-            break;
-        case "float":
-        case "java.lang.Float":
-            schema.put("type", "number");
-            schema.put("format", "float");
-            break;
-        case "boolean":
-        case "java.lang.Boolean":
-            schema.put("type", "boolean");
-            break;
-        default:
-            schema.put("$ref", "#/components/schemas/" + className.substring(className.lastIndexOf('.') + 1));
+            case "java.lang.String":
+                schema.put("type", "string");
+                break;
+            case "char":
+            case "java.lang.Character":
+                schema.put("type", "string");
+                schema.put("format", "uint16");
+                break;
+            case "byte":
+            case "java.lang.Byte":
+                schema.put("type", "integer");
+                schema.put("format", "int8");
+                break;
+            case "short":
+            case "java.lang.Short":
+                schema.put("type", "integer");
+                schema.put("format", "int16");
+                break;
+            case "int":
+            case "java.lang.Integer":
+                schema.put("type", "integer");
+                schema.put("format", "int32");
+                break;
+            case "long":
+            case "java.lang.Long":
+                schema.put("type", "integer");
+                schema.put("format", "int64");
+                break;
+            case "double":
+            case "java.lang.Double":
+                schema.put("type", "number");
+                schema.put("format", "double");
+                break;
+            case "float":
+            case "java.lang.Float":
+                schema.put("type", "number");
+                schema.put("format", "float");
+                break;
+            case "boolean":
+            case "java.lang.Boolean":
+                schema.put("type", "boolean");
+                break;
+            default:
+                schema.put("$ref", "#/components/schemas/" + className.substring(className.lastIndexOf('.') + 1));
         }
 
         return returnschema;
     }
 
-
-   /**
-    * Validates the object against this schema.
-    *
-    * @param obj
-    */
+    /**
+     * Validates the object against this schema.
+     *
+     * @param obj
+     */
     public void validate(final JSONObject obj) {
         // get the components bit of the main metadata
 
@@ -289,11 +266,11 @@ public void validate(final JSONObject obj) {
             schema.validate(toValidate);
         } catch (final ValidationException e) {
             final StringBuilder sb = new StringBuilder("Validation Errors::");
-            e.getCausingExceptions().stream().map(ValidationException::getMessage).forEach(sb::append);
+            e.getCausingExceptions().stream()
+                    .map(ValidationException::getMessage)
+                    .forEach(sb::append);
             logger.info(sb.toString());
             throw new ContractRuntimeException(sb.toString(), e);
         }
-
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/package-info.java
index 743c7b04..d02326ec 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/package-info.java
@@ -4,7 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- *
- */
+/** */
 package org.hyperledger.fabric.contract.metadata;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/package-info.java
index 5185aedb..24dbf8be 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/package-info.java
@@ -7,15 +7,10 @@
 /**
  * Provides interfaces and classes to support the contract programming model.
  *
- * 

- * The {@link org.hyperledger.fabric.contract} package implements the Fabric
- * programming model as described in the Developing
+ * 
The {@link org.hyperledger.fabric.contract} package implements the Fabric programming model as described in the Developing
  * Applications chapter of the Fabric documentation.
  *
- * 

- * The main interface to implement is
- * {@link org.hyperledger.fabric.contract.ContractInterface}
- *
+ * 
The main interface to implement is {@link org.hyperledger.fabric.contract.ContractInterface}
  */
 package org.hyperledger.fabric.contract;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/ContractDefinition.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/ContractDefinition.java
index ba8072cb..4bca0f44 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/ContractDefinition.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/ContractDefinition.java
@@ -8,77 +8,56 @@
 
 import java.lang.reflect.Method;
 import java.util.Collection;
-
 import org.hyperledger.fabric.contract.ContractInterface;
 import org.hyperledger.fabric.contract.annotation.Contract;
 
 /**
  * Definition of the Contract
  *
- * A data structure that represents the contract that will be executed in the
- * chaincode. Primarily has
+ * 
A data structure that represents the contract that will be executed in the chaincode. Primarily has
  *
- * Name - either defined by the Contract annotation or the Class name (can be
- * referred to as Namespace) Default - is the default contract (defined by the
- * Default annotation) TxFunctions in this contract do not need the name prefix
+ * 
Name - either defined by the Contract annotation or the Class name (can be referred to as Namespace) Default - is
+ * the default contract (defined by the Default annotation) TxFunctions in this contract do not need the name prefix
  * when invoked TxFunctions - the transaction functions defined in this contract
  *
- * Will embedded the ContractInterface instance, as well as the annotation
- * itself, and the routing for any tx function that is unknown
- *
+ * 
Will embedded the ContractInterface instance, as well as the annotation itself, and the routing for any tx
+ * function that is unknown
  */
 public interface ContractDefinition {
 
-    /**
-     * @return the fully qualified name of the Contract
-     */
+    /** @return the fully qualified name of the Contract */
     String getName();
 
-    /**
-     * @return Complete collection of all the transaction functions in this contract
-     */
+    /** @return Complete collection of all the transaction functions in this contract */
     Collection getTxFunctions();
 
-    /**
-     * @return Object reference to the instantiated object that is 'the contract'
-     */
+    /** @return Object reference to the instantiated object that is 'the contract' */
     Class getContractImpl();
 
     /**
-     * @param m The java.lang.reflect object that is the method that is a tx
-     *          function
+     * @param m The java.lang.reflect object that is the method that is a tx function
      * @return TxFunction object representing this method
      */
     TxFunction addTxFunction(Method m);
 
-    /**
-     *
-     * @return if this is contract is the default one or not
-     */
+    /** @return if this is contract is the default one or not */
     boolean isDefault();
 
     /**
-     *
      * @param method name to be returned
      * @return TxFunction that represents this requested method
      */
     TxFunction getTxFunction(String method);
 
     /**
-     *
      * @param method name to be checked
      * @return true if this txFunction exists or not
      */
     boolean hasTxFunction(String method);
 
-    /**
-     * @return The TxFunction to be used for this contract in case of unknown
-     *         request
-     */
+    /** @return The TxFunction to be used for this contract in case of unknown request */
     TxFunction getUnknownRoute();
 
-    /**
-     * @return Underlying raw annotation
-     */
+    /** @return Underlying raw annotation */
     Contract getAnnotation();
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/DataTypeDefinition.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/DataTypeDefinition.java
index 3267a718..84d2e3fb 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/DataTypeDefinition.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/DataTypeDefinition.java
@@ -6,33 +6,22 @@
 package org.hyperledger.fabric.contract.routing;
 
 import java.util.Map;
-
 import org.hyperledger.fabric.contract.metadata.TypeSchema;
 
 public interface DataTypeDefinition {
 
-    /**
-     * @return String
-     */
+    /** @return String */
     String getName();
 
-    /**
-     * @return Map of String to PropertyDefinitions
-     */
+    /** @return Map of String to PropertyDefinitions */
     Map getProperties();
 
-    /**
-     * @return String
-     */
+    /** @return String */
     String getSimpleName();
 
-    /**
-     * @return Class object of the type
-     */
+    /** @return Class object of the type */
     Class getTypeClass();
 
-    /**
-     * @return TypeSchema
-     */
+    /** @return TypeSchema */
     TypeSchema getSchema();
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/ParameterDefinition.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/ParameterDefinition.java
index bc81c234..2411e6aa 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/ParameterDefinition.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/ParameterDefinition.java
@@ -6,29 +6,19 @@
 package org.hyperledger.fabric.contract.routing;
 
 import java.lang.reflect.Parameter;
-
 import org.hyperledger.fabric.contract.metadata.TypeSchema;
 
 public interface ParameterDefinition {
 
-    /**
-     * @return Class type of the parameter
-     */
+    /** @return Class type of the parameter */
     Class getTypeClass();
 
-    /**
-     * @return TypeSchema of the parameter
-     */
+    /** @return TypeSchema of the parameter */
     TypeSchema getSchema();
 
-    /**
-     * @return Parameter
-     */
+    /** @return Parameter */
     Parameter getParameter();
 
-    /**
-     * @return name of the parameter
-     */
+    /** @return name of the parameter */
     String getName();
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/PropertyDefinition.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/PropertyDefinition.java
index dd4e7e37..4c53cdc7 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/PropertyDefinition.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/PropertyDefinition.java
@@ -6,29 +6,19 @@
 package org.hyperledger.fabric.contract.routing;
 
 import java.lang.reflect.Field;
-
 import org.hyperledger.fabric.contract.metadata.TypeSchema;
 
 public interface PropertyDefinition {
 
-    /**
-     * @return Class of the Property
-     */
+    /** @return Class of the Property */
     Class getTypeClass();
 
-    /**
-     * @return TypeSchema
-     */
+    /** @return TypeSchema */
     TypeSchema getSchema();
 
-    /**
-     * @return Field
-     */
+    /** @return Field */
     Field getField();
 
-    /**
-     * @return Name of the property
-     */
+    /** @return Name of the property */
     String getName();
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/RoutingRegistry.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/RoutingRegistry.java
index 3c4e9825..264ff9b2 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/RoutingRegistry.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/RoutingRegistry.java
@@ -6,7 +6,6 @@
 package org.hyperledger.fabric.contract.routing;
 
 import java.util.Collection;
-
 import org.hyperledger.fabric.contract.ContractInterface;
 import org.hyperledger.fabric.contract.execution.InvocationRequest;
 
@@ -65,5 +64,4 @@ public interface RoutingRegistry {
      * @param typeRegistry
      */
     void findAndSetContracts(TypeRegistry typeRegistry);
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/TransactionType.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/TransactionType.java
index 80472df5..37e307b7 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/TransactionType.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/TransactionType.java
@@ -6,24 +6,14 @@
 package org.hyperledger.fabric.contract.routing;
 
 public enum TransactionType {
-    /**
-      *
-      */
-    INVOKE, //deprecated
-    /**
-      *
-      */
-    QUERY, //deprecated
-    /**
-      *
-      */
-     DEFAULT, //deprecated
-    /**
-      *
-      */
+    /** */
+    INVOKE, // deprecated
+    /** */
+    QUERY, // deprecated
+    /** */
+    DEFAULT, // deprecated
+    /** */
     SUBMIT,
-    /**
-      *
-      */
+    /** */
     EVALUATE
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/TxFunction.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/TxFunction.java
index 860e2278..392419fa 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/TxFunction.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/TxFunction.java
@@ -8,7 +8,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
-
 import org.hyperledger.fabric.contract.ContractInterface;
 import org.hyperledger.fabric.contract.metadata.TypeSchema;
 
@@ -17,86 +16,68 @@ public interface TxFunction {
     interface Routing {
         /**
          * Method to route calls to the transaction function.
+         *
          * @return a method.
          */
         Method getMethod();
 
         /**
          * The associated contract class.
+         *
          * @return a contract class.
          */
         Class getContractClass();
 
         /**
          * The associated contract instance.
+         *
          * @return a contract.
          * @throws IllegalAccessException
          * @throws InstantiationException
          * @throws InvocationTargetException
          * @throws NoSuchMethodException
          */
-        ContractInterface getContractInstance() throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException;
+        ContractInterface getContractInstance()
+                throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException;
 
         /**
          * Name of the serializer used for the transaction function.
+         *
          * @return a serializer name.
          */
         String getSerializerName();
     }
 
-    /**
-     * @return is this tx to be called when request fn is unknown
-     */
+    /** @return is this tx to be called when request fn is unknown */
     boolean isUnknownTx();
 
-    /**
-     * @param unknown true if the transaction is to be called when the request fn is unknown; otherwise false.
-     */
+    /** @param unknown true if the transaction is to be called when the request fn is unknown; otherwise false. */
     void setUnknownTx(boolean unknown);
 
-    /**
-     * @return Name
-     */
+    /** @return Name */
     String getName();
 
-    /**
-     * @return Routing object
-     */
+    /** @return Routing object */
     Routing getRouting();
 
-    /**
-     * @return Class of the return type
-     */
+    /** @return Class of the return type */
     Class getReturnType();
 
-    /**
-     * @return Parameter array
-     */
+    /** @return Parameter array */
     java.lang.reflect.Parameter[] getParameters();
 
-    /**
-     * @return Submit or Evaluate
-     */
+    /** @return Submit or Evaluate */
     TransactionType getType();
 
-    /**
-     * @param returnSchema
-     */
+    /** @param returnSchema */
     void setReturnSchema(TypeSchema returnSchema);
 
-    /**
-     * @return TypeSchema of the return type
-     */
+    /** @return TypeSchema of the return type */
     TypeSchema getReturnSchema();
 
-    /**
-     * @param list
-     */
+    /** @param list */
     void setParameterDefinitions(List list);
 
-    /**
-     * @return List of parameters
-     */
+    /** @return List of parameters */
     List getParamsList();
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/TypeRegistry.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/TypeRegistry.java
index 73271956..4b61e2d4 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/TypeRegistry.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/TypeRegistry.java
@@ -6,27 +6,20 @@
 package org.hyperledger.fabric.contract.routing;
 
 import java.util.Collection;
-
 import org.hyperledger.fabric.contract.metadata.TypeSchema;
 import org.hyperledger.fabric.contract.routing.impl.TypeRegistryImpl;
 
 public interface TypeRegistry {
 
-    /**
-     * @return TypeRegistry
-     */
+    /** @return TypeRegistry */
     static TypeRegistry getRegistry() {
         return TypeRegistryImpl.getInstance();
     }
 
-    /**
-     * @param dtd
-     */
+    /** @param dtd */
     void addDataType(DataTypeDefinition dtd);
 
-    /**
-     * @param cl
-     */
+    /** @param cl */
     void addDataType(Class cl);
 
     /**
@@ -41,9 +34,6 @@ static TypeRegistry getRegistry() {
      */
     DataTypeDefinition getDataType(TypeSchema schema);
 
-    /**
-     * @return All datatypes
-     */
+    /** @return All datatypes */
     Collection getAllDataTypes();
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/ContractDefinitionImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/ContractDefinitionImpl.java
index 09a293fc..056b3abc 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/ContractDefinitionImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/ContractDefinitionImpl.java
@@ -9,7 +9,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.hyperledger.fabric.Logger;
 import org.hyperledger.fabric.contract.Context;
 import org.hyperledger.fabric.contract.ContractInterface;
@@ -22,9 +21,7 @@
 /**
  * Implementation of the ContractDefinition.
  *
- * Contains information about the contract, including transaction functions and
- * unknown transaction routing
- *
+ * 
Contains information about the contract, including transaction functions and unknown transaction routing
  */
 public final class ContractDefinitionImpl implements ContractDefinition {
     private static Logger logger = Logger.getLogger(ContractDefinitionImpl.class);
@@ -36,10 +33,7 @@ public final class ContractDefinitionImpl implements ContractDefinition {
     private final Contract contractAnnotation;
     private TxFunction unknownTx;
 
-    /**
-     *
-     * @param cl
-     */
+    /** @param cl */
     public ContractDefinitionImpl(final Class cl) {
 
         final Contract annotation = cl.getAnnotation(Contract.class);
@@ -62,7 +56,8 @@ public ContractDefinitionImpl(final Class cl) {
             unknownTx = new TxFunctionImpl(m, this);
             unknownTx.setUnknownTx(true);
         } catch (NoSuchMethodException | SecurityException e) {
-            final ContractRuntimeException cre = new ContractRuntimeException("Failure to find unknownTransaction method", e);
+            final ContractRuntimeException cre =
+                    new ContractRuntimeException("Failure to find unknownTransaction method", e);
             logger.severe(() -> logger.formatError(cre));
             throw cre;
         }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/DataTypeDefinitionImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/DataTypeDefinitionImpl.java
index 78c2b9a1..5165bfbf 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/DataTypeDefinitionImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/DataTypeDefinitionImpl.java
@@ -9,7 +9,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Stream;
-
 import org.hyperledger.fabric.contract.annotation.Property;
 import org.hyperledger.fabric.contract.metadata.TypeSchema;
 import org.hyperledger.fabric.contract.routing.DataTypeDefinition;
@@ -22,10 +21,7 @@ public final class DataTypeDefinitionImpl implements DataTypeDefinition {
     private final String simpleName;
     private final Class clazz;
 
-    /**
-     *
-     * @param componentClass
-     */
+    /** @param componentClass */
     public DataTypeDefinitionImpl(final Class componentClass) {
         this.clazz = componentClass;
         this.name = componentClass.getName();
@@ -44,20 +40,22 @@ public DataTypeDefinitionImpl(final Class componentClass) {
                     final String userKey = userSupplied[i];
                     Object userValue;
                     switch (userKey.toLowerCase()) {
-                    case "title":
-                    case "pattern":
-                        userValue = userSupplied[i + 1];
-                        break;
-                    case "uniqueitems":
-                        userValue = Boolean.parseBoolean(userSupplied[i + 1]);
-                        break;
-                    case "required":
-                    case "enum":
-                        userValue = Stream.of(userSupplied[i + 1].split(",")).map(String::trim).toArray(String[]::new);
-                        break;
-                    default:
-                        userValue = Integer.parseInt(userSupplied[i + 1]);
-                        break;
+                        case "title":
+                        case "pattern":
+                            userValue = userSupplied[i + 1];
+                            break;
+                        case "uniqueitems":
+                            userValue = Boolean.parseBoolean(userSupplied[i + 1]);
+                            break;
+                        case "required":
+                        case "enum":
+                            userValue = Stream.of(userSupplied[i + 1].split(","))
+                                    .map(String::trim)
+                                    .toArray(String[]::new);
+                            break;
+                        default:
+                            userValue = Integer.parseInt(userSupplied[i + 1]);
+                            break;
                     }
                     ts.put(userKey, userValue);
                 }
@@ -66,7 +64,6 @@ public DataTypeDefinitionImpl(final Class componentClass) {
                 this.properties.put(f.getName(), propDef);
             }
         }
-
     }
 
     @Override
@@ -115,5 +112,4 @@ public String getSimpleName() {
     public String toString() {
         return this.simpleName + " " + properties;
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/ParameterDefinitionImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/ParameterDefinitionImpl.java
index a99765ca..7fa8f6e6 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/ParameterDefinitionImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/ParameterDefinitionImpl.java
@@ -7,7 +7,6 @@
 package org.hyperledger.fabric.contract.routing.impl;
 
 import java.lang.reflect.Parameter;
-
 import org.hyperledger.fabric.contract.metadata.TypeSchema;
 import org.hyperledger.fabric.contract.routing.ParameterDefinition;
 
@@ -19,13 +18,13 @@ public final class ParameterDefinitionImpl implements ParameterDefinition {
     private final String name;
 
     /**
-     *
      * @param name
      * @param typeClass
      * @param schema
      * @param p
      */
-    public ParameterDefinitionImpl(final String name, final Class typeClass, final TypeSchema schema, final Parameter p) {
+    public ParameterDefinitionImpl(
+            final String name, final Class typeClass, final TypeSchema schema, final Parameter p) {
         this.typeClass = typeClass;
         this.schema = schema;
         this.parameter = p;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/PropertyDefinitionImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/PropertyDefinitionImpl.java
index 5ea83705..f7772d04 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/PropertyDefinitionImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/PropertyDefinitionImpl.java
@@ -7,7 +7,6 @@
 package org.hyperledger.fabric.contract.routing.impl;
 
 import java.lang.reflect.Field;
-
 import org.hyperledger.fabric.contract.metadata.TypeSchema;
 import org.hyperledger.fabric.contract.routing.PropertyDefinition;
 
@@ -19,7 +18,6 @@ public final class PropertyDefinitionImpl implements PropertyDefinition {
     private final String name;
 
     /**
-     *
      * @param name
      * @param typeClass
      * @param schema
@@ -51,5 +49,4 @@ public Field getField() {
     public String getName() {
         return this.name;
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/RoutingRegistryImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/RoutingRegistryImpl.java
index 084b3280..5996137c 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/RoutingRegistryImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/RoutingRegistryImpl.java
@@ -5,6 +5,9 @@
  */
 package org.hyperledger.fabric.contract.routing.impl;
 
+import io.github.classgraph.ClassGraph;
+import io.github.classgraph.ClassInfo;
+import io.github.classgraph.ScanResult;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -13,7 +16,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.hyperledger.fabric.Logger;
 import org.hyperledger.fabric.contract.ContractInterface;
 import org.hyperledger.fabric.contract.ContractRuntimeException;
@@ -26,18 +28,12 @@
 import org.hyperledger.fabric.contract.routing.TxFunction;
 import org.hyperledger.fabric.contract.routing.TypeRegistry;
 
-import io.github.classgraph.ClassGraph;
-import io.github.classgraph.ClassInfo;
-import io.github.classgraph.ScanResult;
-
 /**
- * Registry to hold permit access to the routing definitions. This is the
- * primary internal data structure to permit access to information about the
- * contracts, and their transaction functions.
- *
- * Contracts are added, and processed. At runtime, this can then be accessed to
- * locate a specific 'Route' that can be handed off to the ExecutionService
+ * Registry to hold permit access to the routing definitions. This is the primary internal data structure to permit
+ * access to information about the contracts, and their transaction functions.
  *
+ * 
Contracts are added, and processed. At runtime, this can then be accessed to locate a specific 'Route' that can be
+ * handed off to the ExecutionService
  */
 public final class RoutingRegistryImpl implements RoutingRegistry {
     private static Logger logger = Logger.getLogger(RoutingRegistryImpl.class);
@@ -131,7 +127,6 @@ public ContractDefinition getContract(final String namespace) {
     @Override
     public Collection getAllDefinitions() {
         return contracts.values();
-
     }
 
     /*
@@ -145,9 +140,7 @@ public Collection getAllDefinitions() {
     public void findAndSetContracts(final TypeRegistry typeRegistry) {
 
         // Find all classes that are valid contract or data type instances.
-        final ClassGraph classGraph = new ClassGraph()
-                .enableClassInfo()
-                .enableAnnotationInfo();
+        final ClassGraph classGraph = new ClassGraph().enableClassInfo().enableAnnotationInfo();
         final List> contractClasses = new ArrayList<>();
         final List> dataTypeClasses = new ArrayList<>();
         try (ScanResult scanResult = classGraph.scan()) {
@@ -198,7 +191,6 @@ public void findAndSetContracts(final TypeRegistry typeRegistry) {
 
         // now need to look for the data types have been set with the
         dataTypeClasses.forEach(typeRegistry::addDataType);
-
     }
 
     private void addContracts(final List> contractClasses) {
@@ -217,7 +209,6 @@ private void addContracts(final List> contractClasses)
                         logger.debug("Found annotated method " + m.getName());
 
                         contract.addTxFunction(m);
-
                     }
                 }
 
@@ -225,5 +216,4 @@ private void addContracts(final List> contractClasses)
             }
         }
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/SerializerRegistryImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/SerializerRegistryImpl.java
index 74b9a0b8..3e7c1f74 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/SerializerRegistryImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/SerializerRegistryImpl.java
@@ -5,35 +5,29 @@
  */
 package org.hyperledger.fabric.contract.routing.impl;
 
+import io.github.classgraph.ClassGraph;
+import io.github.classgraph.ClassInfo;
+import io.github.classgraph.ScanResult;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
 import org.hyperledger.fabric.Logger;
 import org.hyperledger.fabric.contract.annotation.Serializer;
 import org.hyperledger.fabric.contract.execution.SerializerInterface;
 
-import io.github.classgraph.ClassGraph;
-import io.github.classgraph.ClassInfo;
-import io.github.classgraph.ScanResult;
-
 /**
  * Registry to hold permit access to the serializer implementations.
  *
- * It holds the serializers that have been defined. JSONTransactionSerializer
- * is the default.
+ * 
It holds the serializers that have been defined. JSONTransactionSerializer is the default.
  */
 public class SerializerRegistryImpl {
     private static Logger logger = Logger.getLogger(SerializerRegistryImpl.class);
 
     private final Class annotationClass = Serializer.class;
 
-    /**
-     *
-     */
-    public SerializerRegistryImpl() {
-    }
+    /** */
+    public SerializerRegistryImpl() {}
 
     // Could index these by name and or type.
     private final Map contents = new HashMap<>();
@@ -41,7 +35,7 @@ public SerializerRegistryImpl() {
     /**
      * Get a Serializer for the matching fully qualified classname, and the Target.
      *
-     * @param name   fully qualified classname
+     * @param name fully qualified classname
      * @param target the intended target of the serializer
      * @return Serializer instance
      */
@@ -50,7 +44,8 @@ public SerializerInterface getSerializer(final String name, final Serializer.TAR
         return contents.get(key);
     }
 
-    private SerializerInterface add(final String name, final Serializer.TARGET target, final Class clazz) {
+    private SerializerInterface add(
+            final String name, final Serializer.TARGET target, final Class clazz) {
         logger.debug(() -> "Adding new Class " + clazz.getCanonicalName() + " for " + target);
         try {
             final String key = name + ":" + target;
@@ -78,7 +73,8 @@ public void findAndSetContents() throws InstantiationException, IllegalAccessExc
         final Set seenClass = new HashSet<>();
 
         try (ScanResult scanResult = classGraph.scan()) {
-            for (final ClassInfo classInfo : scanResult.getClassesWithAnnotation(this.annotationClass.getCanonicalName())) {
+            for (final ClassInfo classInfo :
+                    scanResult.getClassesWithAnnotation(this.annotationClass.getCanonicalName())) {
                 logger.debug("Found class with contract annotation: " + classInfo.getName());
                 try {
                     final Class cls = (Class) classInfo.loadClass();
@@ -94,9 +90,6 @@ public void findAndSetContents() throws InstantiationException, IllegalAccessExc
                     logger.debug("Failed to load class: " + e);
                 }
             }
-
         }
-
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/TxFunctionImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/TxFunctionImpl.java
index b12726d2..3f61350a 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/TxFunctionImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/TxFunctionImpl.java
@@ -10,7 +10,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.hyperledger.fabric.Logger;
 import org.hyperledger.fabric.contract.Context;
 import org.hyperledger.fabric.contract.ContractInterface;
@@ -42,7 +41,6 @@ public final class RoutingImpl implements Routing {
         private final String serializerName;
 
         /**
-         *
          * @param method
          * @param contract
          */
@@ -63,7 +61,9 @@ public Class getContractClass() {
         }
 
         @Override
-        public ContractInterface getContractInstance() throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException {
+        public ContractInterface getContractInstance()
+                throws IllegalAccessException, InstantiationException, InvocationTargetException,
+                        NoSuchMethodException {
             return clazz.getDeclaredConstructor().newInstance();
         }
 
@@ -76,13 +76,12 @@ public String toString() {
         public String getSerializerName() {
             return serializerName;
         }
-
     }
 
     /**
      * New TxFunction Definition Impl.
      *
-     * @param m        Reflect method object
+     * @param m Reflect method object
      * @param contract ContractDefinition this is part of
      */
     public TxFunctionImpl(final Method m, final ContractDefinition contract) {
@@ -114,15 +113,15 @@ public TxFunctionImpl(final Method m, final ContractDefinition contract) {
         this.returnSchema = TypeSchema.typeConvert(m.getReturnType());
 
         // parameter processing
-        final List params = new ArrayList(
-                Arrays.asList(method.getParameters()));
+        final List params =
+                new ArrayList(Arrays.asList(method.getParameters()));
 
         // validate the first one is a context object
         if (params.size() == 0) {
             throw new ContractRuntimeException("First argument should be of type Context");
         } else if (!Context.class.isAssignableFrom(params.get(0).getType())) {
-            throw new ContractRuntimeException(
-                    "First argument should be of type Context " + method.getName() + " " + params.get(0).getType());
+            throw new ContractRuntimeException("First argument should be of type Context " + method.getName() + " "
+                    + params.get(0).getType());
         } else {
 
             params.remove(0);
@@ -137,7 +136,8 @@ public TxFunctionImpl(final Method m, final ContractDefinition contract) {
             final TypeSchema paramMap = new TypeSchema();
             final TypeSchema schema = TypeSchema.typeConvert(parameter.getType());
 
-            final Property annotation = parameter.getAnnotation(org.hyperledger.fabric.contract.annotation.Property.class);
+            final Property annotation =
+                    parameter.getAnnotation(org.hyperledger.fabric.contract.annotation.Property.class);
             if (annotation != null) {
                 final String[] userSupplied = annotation.schema();
                 for (int i = 0; i < userSupplied.length; i += 2) {
@@ -147,8 +147,8 @@ public TxFunctionImpl(final Method m, final ContractDefinition contract) {
 
             paramMap.put("name", parameter.getName());
             paramMap.put("schema", schema);
-            final ParameterDefinition pd = new ParameterDefinitionImpl(parameter.getName(), parameter.getClass(), paramMap,
-                    parameter);
+            final ParameterDefinition pd =
+                    new ParameterDefinitionImpl(parameter.getName(), parameter.getClass(), paramMap, parameter);
             paramsList.add(pd);
         }
     }
@@ -193,10 +193,7 @@ public List getParamsList() {
         return paramsList;
     }
 
-    /**
-     *
-     * @param paramsList
-     */
+    /** @param paramsList */
     public void setParamsList(final ArrayList paramsList) {
         this.paramsList = paramsList;
     }
@@ -209,7 +206,6 @@ public TypeSchema getReturnSchema() {
     @Override
     public void setParameterDefinitions(final List list) {
         this.paramsList = list;
-
     }
 
     @Override
@@ -221,5 +217,4 @@ public boolean isUnknownTx() {
     public void setUnknownTx(final boolean unknown) {
         this.isUnknownTx = unknown;
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/TypeRegistryImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/TypeRegistryImpl.java
index dc50d3dc..07377c77 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/TypeRegistryImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/TypeRegistryImpl.java
@@ -8,15 +8,11 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.hyperledger.fabric.contract.metadata.TypeSchema;
 import org.hyperledger.fabric.contract.routing.DataTypeDefinition;
 import org.hyperledger.fabric.contract.routing.TypeRegistry;
 
-/**
- * Registry to hold the complex data types as defined in the contract.
- *
- */
+/** Registry to hold the complex data types as defined in the contract. */
 public final class TypeRegistryImpl implements TypeRegistry {
 
     private static TypeRegistryImpl singletonInstance;
@@ -75,5 +71,4 @@ public DataTypeDefinition getDataType(final TypeSchema schema) {
         final String format = ref.substring(ref.lastIndexOf("/") + 1);
         return getDataType(format);
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/package-info.java
index 108f8132..e3d4b1ea 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/package-info.java
@@ -4,7 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- *
- */
+/** */
 package org.hyperledger.fabric.contract.routing.impl;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/package-info.java
index 32533b45..4ab5847b 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/package-info.java
@@ -4,7 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- *
- */
+/** */
 package org.hyperledger.fabric.contract.routing;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/systemcontract/SystemContract.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/systemcontract/SystemContract.java
index f2427e22..74fd07ab 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/systemcontract/SystemContract.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/systemcontract/SystemContract.java
@@ -12,22 +12,19 @@
 import org.hyperledger.fabric.contract.annotation.Transaction;
 import org.hyperledger.fabric.contract.metadata.MetadataBuilder;
 
-/**
- *
- */
-@Contract(name = "org.hyperledger.fabric",
-        info = @Info(title = "Fabric System Contract", description = "Provides information about the contracts within this container"))
+/** */
+@Contract(
+        name = "org.hyperledger.fabric",
+        info =
+                @Info(
+                        title = "Fabric System Contract",
+                        description = "Provides information about the contracts within this container"))
 public final class SystemContract implements ContractInterface {
 
-    /**
-     *
-     */
-    public SystemContract() {
-
-    }
+    /** */
+    public SystemContract() {}
 
     /**
-     *
      * @param ctx
      * @return Metadata
      */
@@ -36,5 +33,4 @@ public String getMetadata(final Context ctx) {
         final String jsonmetadata = MetadataBuilder.getMetadata();
         return jsonmetadata;
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/systemcontract/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/systemcontract/package-info.java
index 5dcfe058..cde12bb0 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/systemcontract/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/systemcontract/package-info.java
@@ -4,7 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- *
- */
+/** */
 package org.hyperledger.fabric.contract.systemcontract;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/Collection.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/Collection.java
index 195eb5f8..1f109da8 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/Collection.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/Collection.java
@@ -8,14 +8,12 @@
 /** Place holder. */
 public interface Collection {
 
-    /**
-     * Constant that can be used to refer to the 'Worldstate' collection explicitly.
-     */
+    /** Constant that can be used to refer to the 'Worldstate' collection explicitly. */
     String WORLD = "worldstate";
 
     /**
-     * Placeholder. Purely in place to prevent Checkstyle inferring this class is pointless.
-     * will be removed in the next story
+     * Placeholder. Purely in place to prevent Checkstyle inferring this class is pointless. will be removed in the next
+     * story
      */
     void placeholder();
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/Ledger.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/Ledger.java
index ce347971..3f9c11cc 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/Ledger.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/Ledger.java
@@ -11,40 +11,36 @@
 /**
  * Ledger representing the overall shared Transaction Data of the Network.
  *
- * It is composed of a number of collections, one being the public or world
- * state, and other private data collections, including the implicit
- * organizational collections.
- *
- * Ledger objects can be passed between methods if required. All operations on
- * the Ledger directly or via any child object such as a Collection will be
- * controlled by the supplied transactional context.
+ * 
It is composed of a number of collections, one being the public or world state, and other private data
+ * collections, including the implicit organizational collections.
  *
+ * 
Ledger objects can be passed between methods if required. All operations on the Ledger directly or via any child
+ * object such as a Collection will be controlled by the supplied transactional context.
  */
 public interface Ledger {
 
     /**
      * Get the Ledger instance that represents the current ledger state.
      *
-     * Any interactions with the ledger will be done under the control of the
-     * transactional context supplied. The ledger object may be passed to other
-     * methods if required.
+     * 
Any interactions with the ledger will be done under the control of the transactional context supplied. The
+     * ledger object may be passed to other methods if required.
      *
-     * A new instance is returned on each call.
+     * 
A new instance is returned on each call.
      *
-     * @param ctx Context The Transactional context to use for interactions with
-     *            this ledger
+     * @param ctx Context The Transactional context to use for interactions with this ledger
      * @return Ledger instance
      */
     static Ledger getLedger(final Context ctx) {
         return new LedgerImpl(ctx);
-    };
+    }
+    ;
 
     /**
      * Return the a collection based on the supplied name.
      *
-     * Private Data collections can be accessed by name.
+     * 
Private Data collections can be accessed by name.
      *
-     * A new instance of a Collection object is returned on each call.
+     * 
A new instance of a Collection object is returned on each call.
      *
      * @param name
      * @return Collection instance
@@ -54,7 +50,7 @@ static Ledger getLedger(final Context ctx) {
     /**
      * Return the World State collection.
      *
-     * A new instance of a Collection object is returned on each call.
+     * 
A new instance of a Collection object is returned on each call.
      *
      * @return Collection instance
      */
@@ -63,14 +59,12 @@ static Ledger getLedger(final Context ctx) {
     /**
      * Return a implicit organization collection.
      *
-     * Given the mspid of the ogranization return the private data collection that
-     * is implicitly created
+     * 
Given the mspid of the ogranization return the private data collection that is implicitly created
      *
-     * A new instance of a Collection object is returned on each call.
+     * 
A new instance of a Collection object is returned on each call.
      *
      * @param mspid String Organization's mspid
      * @return Collection instance
      */
     Collection getOrganizationCollection(String mspid);
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/impl/CollectionImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/impl/CollectionImpl.java
index faea7f49..c313ef77 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/impl/CollectionImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/impl/CollectionImpl.java
@@ -7,16 +7,12 @@
 
 import org.hyperledger.fabric.ledger.Collection;
 
-/**
- * Placeholder.
- */
+/** Placeholder. */
 public class CollectionImpl implements Collection {
 
     private final String name;
 
     /**
-     *
-     *
      * @param name
      * @param ledgerImpl
      */
@@ -29,5 +25,4 @@ public void placeholder() {
         // TODO Auto-generated method stub
 
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/impl/LedgerImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/impl/LedgerImpl.java
index 1087cd24..9f8ed761 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/impl/LedgerImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/impl/LedgerImpl.java
@@ -39,5 +39,4 @@ public Collection getDefaultCollection() {
     public Collection getOrganizationCollection(final String mspid) {
         return this.getCollection("_implicit_org_" + mspid);
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/impl/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/impl/package-info.java
index 96b288ea..025bb854 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/impl/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/impl/package-info.java
@@ -1,6 +1,6 @@
-/*
- * Copyright 2023 IBM All Rights Reserved.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.fabric.ledger.impl;
+/*
+ * Copyright 2023 IBM All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.fabric.ledger.impl;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/package-info.java
index ca6cfec7..129a4271 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/ledger/package-info.java
@@ -4,9 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * 

- * Provides the API for contracts to access the shared ledger.
- *
- */
+/** Provides the API for contracts to access the shared ledger. */
 package org.hyperledger.fabric.ledger;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/Metrics.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/Metrics.java
index 56bcdab6..74cd6247 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/Metrics.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/Metrics.java
@@ -8,16 +8,14 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Properties;
 import java.util.logging.Logger;
-
 import org.hyperledger.fabric.metrics.impl.DefaultProvider;
 import org.hyperledger.fabric.metrics.impl.NullProvider;
 
 /**
  * Metrics Interface.
  *
- * Metrics setups up the provider in use from the configuration supplied If not
- * enabled, nothing happens, but if enabled but no specific logger default is
- * used that uses the org.hyperledger.Performance logger
+ * 
Metrics setups up the provider in use from the configuration supplied If not enabled, nothing happens, but if
+ * enabled but no specific logger default is used that uses the org.hyperledger.Performance logger
  */
 public final class Metrics {
 
@@ -28,13 +26,9 @@ public final class Metrics {
 
     private static MetricsProvider provider;
 
-
-    private Metrics() {
-
-    }
+    private Metrics() {}
 
     /**
-     *
      * @param props
      * @return The metrics provide
      */
@@ -46,37 +40,36 @@ public static MetricsProvider initialize(final Properties props) {
                     final String providerClass = (String) props.get(CHAINCODE_METRICS_PROVIDER);
 
                     @SuppressWarnings("unchecked") // it must be this type otherwise an error
-                    final
-                    Class clazz = (Class) Class.forName(providerClass);
+                    final Class clazz = (Class) Class.forName(providerClass);
                     provider = clazz.getConstructor().newInstance();
                 } else {
                     logger.info("Using default metrics provider (logs to org.hyperledger.Performance)");
                     provider = new DefaultProvider();
                 }
-            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
-                    | NoSuchMethodException | SecurityException e) {
+            } catch (ClassNotFoundException
+                    | InstantiationException
+                    | IllegalAccessException
+                    | IllegalArgumentException
+                    | InvocationTargetException
+                    | NoSuchMethodException
+                    | SecurityException e) {
                 throw new RuntimeException("Unable to start metrics", e);
             }
         } else {
             // return a 'null' provider
             logger.info("Metrics disabled");
             provider = new NullProvider();
-
         }
 
         provider.initialize(props);
         return provider;
     }
 
-    /**
-     *
-     * @return MetricsProvider
-     */
+    /** @return MetricsProvider */
     public static MetricsProvider getProvider() {
         if (provider == null) {
             throw new IllegalStateException("No provider set, this should have been set");
         }
         return provider;
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/MetricsProvider.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/MetricsProvider.java
index 482fbbdf..9609ea87 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/MetricsProvider.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/MetricsProvider.java
@@ -9,20 +9,16 @@
 import java.util.Properties;
 
 /**
- * Interface to be implemented to send metrics on the chaincode to the
- * 'backend-of-choice'.
+ * Interface to be implemented to send metrics on the chaincode to the 'backend-of-choice'.
  *
- * An instance of this will be created, and provided with the resources from
- * which chaincode specific metrics can be collected. (via the no-argument
- * constructor).
+ * 
An instance of this will be created, and provided with the resources from which chaincode specific metrics can be
+ * collected. (via the no-argument constructor).
  *
- * The choice of when, where and what to collect etc are within the remit of the
- * provider.
+ * 
The choice of when, where and what to collect etc are within the remit of the provider.
  *
- * This is the effective call sequence.
+ * 
This is the effective call sequence.
  *
- * MyMetricsProvider mmp = new MyMetricsProvider()
- * mmp.initialize(props_from_environment); // short while later....
+ * 
MyMetricsProvider mmp = new MyMetricsProvider() mmp.initialize(props_from_environment); // short while later....
  * mmp.setTaskMetricsCollector(taskService);
  */
 public interface MetricsProvider {
@@ -32,17 +28,15 @@ public interface MetricsProvider {
      *
      * @param props
      */
-    default void initialize(final Properties props) {
-    };
+    default void initialize(final Properties props) {}
+    ;
 
     /**
-     * Pass a reference to this task service for information gathering. This is
-     * related specifically to the handling of tasks within the chaincode. i.e. how
-     * individual transactions are dispatched for execution.
+     * Pass a reference to this task service for information gathering. This is related specifically to the handling of
+     * tasks within the chaincode. i.e. how individual transactions are dispatched for execution.
      *
      * @param taskService
      */
-    default void setTaskMetricsCollector(final TaskMetricsCollector taskService) {
-    };
-
+    default void setTaskMetricsCollector(final TaskMetricsCollector taskService) {}
+    ;
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/TaskMetricsCollector.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/TaskMetricsCollector.java
index bb2c6065..ef59d6a4 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/TaskMetricsCollector.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/TaskMetricsCollector.java
@@ -8,11 +8,9 @@
 /**
  * Collect metrics relating to the task execution.
  *
- * The task execution (of which each fabric transaction is one) is backed by a
- * thread pool that implements this interface. As that is an implementation
- * class this interface abstracts the information available from it (as far as
+ * 
The task execution (of which each fabric transaction is one) is backed by a thread pool that implements this
+ * interface. As that is an implementation class this interface abstracts the information available from it (as far as
  * metrics go).
- *
  */
 public interface TaskMetricsCollector {
 
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/impl/DefaultProvider.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/impl/DefaultProvider.java
index a2dc8a78..841e4164 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/impl/DefaultProvider.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/impl/DefaultProvider.java
@@ -9,24 +9,17 @@
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.logging.Logger;
-
 import org.hyperledger.fabric.Logging;
 import org.hyperledger.fabric.metrics.MetricsProvider;
 import org.hyperledger.fabric.metrics.TaskMetricsCollector;
 
-/**
- * Simple default provider that logs to the org.hyperledger.Performance logger
- * the basic metrics.
- *
- */
+/** Simple default provider that logs to the org.hyperledger.Performance logger the basic metrics. */
 public final class DefaultProvider implements MetricsProvider {
     private static Logger perflogger = Logger.getLogger(Logging.PERFLOGGER);
 
     private TaskMetricsCollector taskService;
 
-    /**
-     *
-     */
+    /** */
     public DefaultProvider() {
         perflogger.info("Default Metrics Provider started");
     }
@@ -41,13 +34,15 @@ public void setTaskMetricsCollector(final TaskMetricsCollector taskService) {
     @Override
     public void initialize(final Properties props) {
         final Timer metricTimer = new Timer(true);
-        metricTimer.scheduleAtFixedRate(new TimerTask() {
-            @Override
-            public void run() {
-                DefaultProvider.this.logMetrics();
-            }
-        }, 0, TIME_INTERVAL);
-
+        metricTimer.scheduleAtFixedRate(
+                new TimerTask() {
+                    @Override
+                    public void run() {
+                        DefaultProvider.this.logMetrics();
+                    }
+                },
+                0,
+                TIME_INTERVAL);
     }
 
     protected void logMetrics() {
@@ -58,14 +53,18 @@ protected void logMetrics() {
             }
             final StringBuilder sb = new StringBuilder();
             sb.append('{');
-            sb.append(String.format(" \"active_count\":%d ", DefaultProvider.this.taskService.getActiveCount())).append(',');
-            sb.append(String.format(" \"pool_size\":%d ", DefaultProvider.this.taskService.getPoolSize())).append(',');
-            sb.append(String.format(" \"core_pool_size\":%d ", DefaultProvider.this.taskService.getCorePoolSize())).append(',');
-            sb.append(String.format(" \"current_task_count\":%d ", DefaultProvider.this.taskService.getCurrentTaskCount())).append(',');
-            sb.append(String.format(" \"current_queue_depth\":%d ", DefaultProvider.this.taskService.getCurrentQueueCount()));
+            sb.append(String.format(" \"active_count\":%d ", DefaultProvider.this.taskService.getActiveCount()))
+                    .append(',');
+            sb.append(String.format(" \"pool_size\":%d ", DefaultProvider.this.taskService.getPoolSize()))
+                    .append(',');
+            sb.append(String.format(" \"core_pool_size\":%d ", DefaultProvider.this.taskService.getCorePoolSize()))
+                    .append(',');
+            sb.append(String.format(
+                            " \"current_task_count\":%d ", DefaultProvider.this.taskService.getCurrentTaskCount()))
+                    .append(',');
+            sb.append(String.format(
+                    " \"current_queue_depth\":%d ", DefaultProvider.this.taskService.getCurrentQueueCount()));
             return sb.append('}').toString();
         });
-
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/impl/NullProvider.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/impl/NullProvider.java
index f977ac67..19639009 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/impl/NullProvider.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/impl/NullProvider.java
@@ -7,17 +7,9 @@
 
 import org.hyperledger.fabric.metrics.MetricsProvider;
 
-/**
- * Very simple provider that does absolutely nothing. Used when metrics are
- * disabled.
- *
- */
+/** Very simple provider that does absolutely nothing. Used when metrics are disabled. */
 public class NullProvider implements MetricsProvider {
 
-    /**
-     *
-     */
-    public NullProvider() {
-    }
-
+    /** */
+    public NullProvider() {}
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/impl/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/impl/package-info.java
index 30152965..59afe468 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/impl/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/impl/package-info.java
@@ -4,7 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- *
- */
+/** */
 package org.hyperledger.fabric.metrics.impl;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/package-info.java
index ec9d196a..f9cf1f7b 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/metrics/package-info.java
@@ -7,24 +7,17 @@
 /**
  * Provides interfaces and classes to support collection of metrics.
  *
- * 

- * The main metrics that are available are the statistics around the number of
- * tasks that are running, and how the thread pool is handling these.
+ * 
The main metrics that are available are the statistics around the number of tasks that are running, and how the
+ * thread pool is handling these.
  *
- * 

- * Note a 'task' is a message from the Peer to the Chaincode - this message is
- * either a new transaction, or a response from a stub API, eg getState(). Query
- * apis may return more than one response.
+ * 
Note a 'task' is a message from the Peer to the Chaincode - this message is either a new transaction, or a
+ * response from a stub API, eg getState(). Query apis may return more than one response.
  *
- * 

- * To enable metrics, add a CHAINCODE_METRICS_ENABLED=true setting
- * to the config.props chaincode configuration file.
- * See the Overview for details of how to
- * configure chaincode.
+ * 
To enable metrics, add a CHAINCODE_METRICS_ENABLED=true setting to the config.props
+ * chaincode configuration file. See the Overview for details of how to configure
+ * chaincode.
  *
- * 
Open Telemetry

- *
- * To use Open Telemetry, set the following properties:
+ * 
Open Telemetry To use Open Telemetry, set the following properties:
  *
  * 
  * CHAINCODE_METRICS_ENABLED=true
@@ -34,7 +27,8 @@
  * Additionally, you can set properties after the specification:
  * https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/sdk-environment-variables.md
  *
- * Example:
+ * 
Example:
+ *
  * 
  * OTEL_EXPORTER_OTLP_ENDPOINT=otelcollector:4317
  * OTEL_EXPORTER_OTLP_INSECURE=true
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/package-info.java
index cb5d58f6..dfeb5e02 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/package-info.java
@@ -4,7 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * Provides logging classes.
- */
+/** Provides logging classes. */
 package org.hyperledger.fabric;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/Chaincode.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/Chaincode.java
index 046595df..b8882487 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/Chaincode.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/Chaincode.java
@@ -11,13 +11,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * Defines methods that all chaincodes must implement.
- */
+/** Defines methods that all chaincodes must implement. */
 public interface Chaincode {
     /**
-     * Called during an instantiate transaction after the container has been
-     * established, allowing the chaincode to initialize its internal data.
+     * Called during an instantiate transaction after the container has been established, allowing the chaincode to
+     * initialize its internal data.
      *
      * @param stub the chaincode stub
      * @return the chaincode response
@@ -25,8 +23,7 @@ public interface Chaincode {
     Response init(ChaincodeStub stub);
 
     /**
-     * Called for every Invoke transaction. The chaincode may change its state
-     * variables.
+     * Called for every Invoke transaction. The chaincode may change its state variables.
      *
      * @param stub the chaincode stub
      * @return the chaincode response
@@ -34,9 +31,8 @@ public interface Chaincode {
     Response invoke(ChaincodeStub stub);
 
     /**
-     * Wrapper around protobuf Response, contains status, message and payload.
-     * Object returned by call to {@link #init(ChaincodeStub)}
-     * and{@link #invoke(ChaincodeStub)}
+     * Wrapper around protobuf Response, contains status, message and payload. Object returned by call to
+     * {@link #init(ChaincodeStub)} and{@link #invoke(ChaincodeStub)}
      */
     class Response {
         private final int statusCode;
@@ -45,6 +41,7 @@ class Response {
 
         /**
          * Constructor.
+         *
          * @param status a status object.
          * @param message a response message.
          * @param payload a response payload.
@@ -57,6 +54,7 @@ public Response(final Status status, final String message, final byte[] payload)
 
         /**
          * Constructor.
+         *
          * @param statusCode a status code.
          * @param message a response message.
          * @param payload a response payload.
@@ -69,6 +67,7 @@ public Response(final int statusCode, final String message, final byte[] payload
 
         /**
          * Get the response status.
+         *
          * @return status.
          */
         public Status getStatus() {
@@ -81,6 +80,7 @@ public Status getStatus() {
 
         /**
          * Get the response status code.
+         *
          * @return status code.
          */
         public int getStatusCode() {
@@ -89,6 +89,7 @@ public int getStatusCode() {
 
         /**
          * Get the response message.
+         *
          * @return a message.
          */
         public String getMessage() {
@@ -97,6 +98,7 @@ public String getMessage() {
 
         /**
          * Get the response payload.
+         *
          * @return payload bytes.
          */
         public byte[] getPayload() {
@@ -105,27 +107,20 @@ public byte[] getPayload() {
 
         /**
          * Get the response payload as a UTF-8 string.
+         *
          * @return a string.
          */
         public String getStringPayload() {
             return (payload == null) ? null : new String(payload, UTF_8);
         }
 
-        /**
-         * {@link Response} status enum.
-         */
+        /** {@link Response} status enum. */
         public enum Status {
-            /**
-             * Successful response status.
-             */
+            /** Successful response status. */
             SUCCESS(200),
-            /**
-             * Minimum threshold for as error status code.
-             */
+            /** Minimum threshold for as error status code. */
             ERROR_THRESHOLD(400),
-            /**
-             * Server-side error status.
-             */
+            /** Server-side error status. */
             INTERNAL_SERVER_ERROR(500);
 
             private static final Map CODETOSTATUS = new HashMap<>();
@@ -137,6 +132,7 @@ public enum Status {
 
             /**
              * Get the status code associated with this status object.
+             *
              * @return a status code.
              */
             public int getCode() {
@@ -145,6 +141,7 @@ public int getCode() {
 
             /**
              * Get a status object for a given status code.
+             *
              * @param code a status code.
              * @return a status object.
              */
@@ -158,6 +155,7 @@ public static Status forCode(final int code) {
 
             /**
              * Whether a status exists for a given status code.
+             *
              * @param code a status code.
              * @return True if a status for the code exists; otherwise false.
              */
@@ -170,8 +168,6 @@ public static boolean hasStatusForCode(final int code) {
                     CODETOSTATUS.put(status.code, status);
                 }
             }
-
         }
-
     }
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeBase.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeBase.java
index da8da55e..0ce76bc4 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeBase.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeBase.java
@@ -9,6 +9,14 @@
 import static java.lang.String.format;
 import static java.util.logging.Level.ALL;
 
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.util.JsonFormat;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.shaded.io.grpc.netty.NegotiationType;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
+import io.grpc.stub.StreamObserver;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -26,10 +34,6 @@
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
-
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.util.JsonFormat;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
@@ -43,35 +47,21 @@
 import org.hyperledger.fabric.shim.impl.InvocationTaskManager;
 import org.hyperledger.fabric.traces.Traces;
 
-import io.grpc.ManagedChannelBuilder;
-import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
-import io.grpc.netty.shaded.io.grpc.netty.NegotiationType;
-import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
-import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
-import io.grpc.stub.StreamObserver;
-
 /**
  * Abstract implementation of {@link Chaincode}.
  *
- * 

- * All chaincode implementations must extend the abstract class
- * ChaincodeBase. It is possible to implement chaincode by
- * extending ChaincodeBase directly however new projects should
- * implement {@link org.hyperledger.fabric.contract.ContractInterface} and use
- * the contract programming model instead.
+ * 
All chaincode implementations must extend the abstract class ChaincodeBase. It is possible to
+ * implement chaincode by extending ChaincodeBase directly however new projects should implement
+ * {@link org.hyperledger.fabric.contract.ContractInterface} and use the contract programming model instead.
  *
  * @see org.hyperledger.fabric.contract
  */
 public abstract class ChaincodeBase implements Chaincode {
 
-    /**
-     *
-     */
+    /** */
     public static final String CORE_CHAINCODE_LOGGING_SHIM = "CORE_CHAINCODE_LOGGING_SHIM";
 
-    /**
-     *
-     */
+    /** */
     public static final String CORE_CHAINCODE_LOGGING_LEVEL = "CORE_CHAINCODE_LOGGING_LEVEL";
 
     @Override
@@ -82,19 +72,13 @@ public abstract class ChaincodeBase implements Chaincode {
 
     private static final Logger LOGGER = Logger.getLogger(ChaincodeBase.class.getName());
 
-    /**
-     *
-     */
+    /** */
     public static final String DEFAULT_HOST = "127.0.0.1";
 
-    /**
-     *
-     */
+    /** */
     public static final int DEFAULT_PORT = 7051;
 
-    /**
-     * Default to 100MB for maximum inbound grpc message size.
-     */
+    /** Default to 100MB for maximum inbound grpc message size. */
     public static final String DEFAULT_MAX_INBOUND_MESSAGE_SIZE = "104857600";
 
     private String host = DEFAULT_HOST;
@@ -132,10 +116,10 @@ private int getMaxInboundMessageSize() {
         if (this.props == null) {
             throw new IllegalStateException("Chaincode config not available");
         }
-        final int maxMsgSize = Integer
-                .parseInt(this.props.getProperty(MAX_INBOUND_MESSAGE_SIZE, DEFAULT_MAX_INBOUND_MESSAGE_SIZE));
-        final String msgSizeInfo = String.format("Maximum Inbound Message Size [%s] = %d", MAX_INBOUND_MESSAGE_SIZE,
-                maxMsgSize);
+        final int maxMsgSize =
+                Integer.parseInt(this.props.getProperty(MAX_INBOUND_MESSAGE_SIZE, DEFAULT_MAX_INBOUND_MESSAGE_SIZE));
+        final String msgSizeInfo =
+                String.format("Maximum Inbound Message Size [%s] = %d", MAX_INBOUND_MESSAGE_SIZE, maxMsgSize);
         LOGGER.info(msgSizeInfo);
         return maxMsgSize;
     }
@@ -145,7 +129,6 @@ private int getMaxInboundMessageSize() {
      *
      * @param args command line arguments
      */
-
     public void start(final String[] args) {
         try {
             initializeLogging();
@@ -173,7 +156,8 @@ protected final void connectToPeer() throws IOException {
         // This is then passed to the ChaincodeSupportClient to be connected to the
         // gRPC streams
 
-        final ChaincodeID chaincodeId = ChaincodeID.newBuilder().setName(this.id).build();
+        final ChaincodeID chaincodeId =
+                ChaincodeID.newBuilder().setName(this.id).build();
         final ManagedChannelBuilder channelBuilder = newChannelBuilder();
         final ChaincodeSupportClient chaincodeSupportClient = new ChaincodeSupportClient(channelBuilder);
 
@@ -202,9 +186,9 @@ protected final void connectToPeer() throws IOException {
         // for any error - shut everything down
         // as this is long lived (well forever) then any completion means something
         // has stopped in the peer or the network comms, so also shutdown
-        final StreamObserver requestObserver = chaincodeSupportClient.getStub().register(
-
-                new StreamObserver() {
+        final StreamObserver requestObserver = chaincodeSupportClient
+                .getStub()
+                .register(new StreamObserver() {
                     @Override
                     public void onNext(final ChaincodeMessage chaincodeMessage) {
                         // message off to the ITM...
@@ -225,24 +209,20 @@ public void onCompleted() {
                         LOGGER.severe("Chaincode stream is complete. Shutting down the chaincode stream.");
                         chaincodeSupportClient.shutdown(itm);
                     }
-                }
-
-        );
+                });
 
         chaincodeSupportClient.start(itm, requestObserver);
-
     }
 
     /**
      * connect external chaincode to peer for chat.
      *
      * @param requestObserver reqeust from peer
-     * @return itm - The InnvocationTask Manager handles the message level
-     *         communication with the peer.
+     * @return itm - The InnvocationTask Manager handles the message level communication with the peer.
      * @throws IOException validation fields exception
      */
-    protected StreamObserver connectToPeer(
-            final StreamObserver requestObserver) throws IOException {
+    protected StreamObserver connectToPeer(final StreamObserver requestObserver)
+            throws IOException {
         validateOptions();
         if (requestObserver == null) {
             throw new IOException("StreamObserver 'requestObserver' for chat with peer can't be null");
@@ -256,7 +236,8 @@ protected StreamObserver connectToPeer(
         // This is then passed to the ChaincodeSupportClient to be connected to the
         // gRPC streams
 
-        final ChaincodeID chaincodeId = ChaincodeID.newBuilder().setName(this.id).build();
+        final ChaincodeID chaincodeId =
+                ChaincodeID.newBuilder().setName(this.id).build();
         final ManagedChannelBuilder channelBuilder = newChannelBuilder();
         final ChaincodeSupportClient chaincodeSupportClient = new ChaincodeSupportClient(channelBuilder);
 
@@ -288,8 +269,8 @@ public void onCompleted() {
 
     protected final void initializeLogging() {
         // the VM wide formatting string.
-        System.setProperty("java.util.logging.SimpleFormatter.format",
-                "%1$tH:%1$tM:%1$tS:%1$tL %4$-7.7s %2$-80.80s %5$s%6$s%n");
+        System.setProperty(
+                "java.util.logging.SimpleFormatter.format", "%1$tH:%1$tM:%1$tS:%1$tL %4$-7.7s %2$-80.80s %5$s%6$s%n");
         final Logger rootLogger = Logger.getLogger("");
 
         for (final java.util.logging.Handler handler : rootLogger.getHandlers()) {
@@ -300,7 +281,6 @@ protected final void initializeLogging() {
                 public synchronized String format(final LogRecord record) {
                     return Thread.currentThread() + " " + super.format(record);
                 }
-
             });
         }
 
@@ -322,33 +302,31 @@ public synchronized String format(final LogRecord record) {
         final Level shimLogLevel = mapLevel(System.getenv(CORE_CHAINCODE_LOGGING_SHIM));
         Logger.getLogger(ChaincodeBase.class.getPackage().getName()).setLevel(shimLogLevel);
         Logger.getLogger(ContractRouter.class.getPackage().getName()).setLevel(chaincodeLogLevel);
-
     }
 
     private Level mapLevel(final String level) {
 
         if (level != null) {
             switch (level.toUpperCase().trim()) {
-            case "CRITICAL":
-            case "ERROR":
-                return Level.SEVERE;
-            case "WARNING":
-            case "WARN":
-                return Level.WARNING;
-            case "INFO":
-                return Level.INFO;
-            case "NOTICE":
-                return Level.CONFIG;
-            case "DEBUG":
-                return Level.FINEST;
-            default:
-                break;
+                case "CRITICAL":
+                case "ERROR":
+                    return Level.SEVERE;
+                case "WARNING":
+                case "WARN":
+                    return Level.WARNING;
+                case "INFO":
+                    return Level.INFO;
+                case "NOTICE":
+                    return Level.CONFIG;
+                case "DEBUG":
+                    return Level.FINEST;
+                default:
+                    break;
             }
         }
         return Level.INFO;
     }
 
-
     private SocketAddress parseHostPort(final String hostAddrStr) throws URISyntaxException {
 
         // WORKAROUND: add any scheme to make the resulting URI valid.
@@ -357,8 +335,7 @@ private SocketAddress parseHostPort(final String hostAddrStr) throws URISyntaxEx
         int port = uri.getPort();
 
         if (uri.getHost() == null || uri.getPort() == -1) {
-            throw new URISyntaxException(uri.toString(),
-            "URI must have host and port parts");
+            throw new URISyntaxException(uri.toString(), "URI must have host and port parts");
         }
 
         // validation succeeded
@@ -374,9 +351,7 @@ public boolean isServer() {
         return !chaincodeServerAddress.isEmpty();
     }
 
-    /**
-     * Validate init parameters from env chaincode base.
-     */
+    /** Validate init parameters from env chaincode base. */
     public void validateOptions() {
         if (this.id == null || this.id.isEmpty()) {
             throw new IllegalArgumentException(format(
@@ -435,12 +410,9 @@ protected final void processCommandLineOptions(final String[] args) {
         LOGGER.info("<<<<<<<<<<<<>>>>>>>>>>>");
         LOGGER.info("CORE_CHAINCODE_ID_NAME: " + this.id);
         LOGGER.info("CORE_PEER_ADDRESS: " + this.host + ":" + this.port);
-
     }
 
-    /**
-     * set fields from env.
-     */
+    /** set fields from env. */
     public final void processEnvironmentOptions() {
 
         if (System.getenv().containsKey(CORE_CHAINCODE_ID_NAME)) {
@@ -492,9 +464,8 @@ public final void processEnvironmentOptions() {
     }
 
     /**
-     * Obtains configuration specifically for running the chaincode and settable on
-     * a per chaincode basis rather than taking properties from the Peers'
-     * configuration.
+     * Obtains configuration specifically for running the chaincode and settable on a per chaincode basis rather than
+     * taking properties from the Peers' configuration.
      *
      * @return Configuration
      */
@@ -579,8 +550,10 @@ final SslContext createSSLContext() throws IOException {
         final byte[] ckb = Files.readAllBytes(Paths.get(this.tlsClientKeyPath));
         final byte[] ccb = Files.readAllBytes(Paths.get(this.tlsClientCertPath));
 
-        return GrpcSslContexts.forClient().trustManager(new File(this.tlsClientRootCertPath))
-                .keyManager(new ByteArrayInputStream(Base64.getDecoder().decode(ccb)),
+        return GrpcSslContexts.forClient()
+                .trustManager(new File(this.tlsClientRootCertPath))
+                .keyManager(
+                        new ByteArrayInputStream(Base64.getDecoder().decode(ccb)),
                         new ByteArrayInputStream(Base64.getDecoder().decode(ckb)))
                 .build();
     }
@@ -663,12 +636,9 @@ String getId() {
         return id;
     }
 
-    /**
-     * Chaincode State.
-     */
+    /** Chaincode State. */
     public enum CCState {
-        /**
-         * */
+        /** */
         CREATED,
         /** */
         ESTABLISHED,
@@ -678,18 +648,12 @@ public enum CCState {
 
     private CCState state = CCState.CREATED;
 
-    /**
-     *
-     * @return State
-     */
+    /** @return State */
     public final CCState getState() {
         return this.state;
     }
 
-    /**
-     *
-     * @param newState
-     */
+    /** @param newState */
     public final void setState(final CCState newState) {
         this.state = newState;
     }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeException.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeException.java
index fe73b570..7a4b5312 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeException.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeException.java
@@ -8,18 +8,13 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
- * Contracts should use {@code ChaincodeException} to indicate when an error
- * occurs in Smart Contract logic.
+ * Contracts should use {@code ChaincodeException} to indicate when an error occurs in Smart Contract logic.
  *
- * 

- * When a {@code ChaincodeException} is thrown an error response will be
- * returned from the chaincode container containing the exception message and
- * payload, if specified.
+ * 
When a {@code ChaincodeException} is thrown an error response will be returned from the chaincode container
+ * containing the exception message and payload, if specified.
  *
- * 

- * {@code ChaincodeException} may be extended to provide application specific
- * error information. Subclasses should ensure that {@link #getPayload} returns
- * a serialized representation of the error in a suitable format for client
+ * 
{@code ChaincodeException} may be extended to provide application specific error information. Subclasses should
+ * ensure that {@link #getPayload} returns a serialized representation of the error in a suitable format for client
  * applications to process.
  */
 public class ChaincodeException extends RuntimeException {
@@ -28,16 +23,13 @@ public class ChaincodeException extends RuntimeException {
 
     private byte[] payload;
 
-    /**
-     * Constructs a new {@code ChaincodeException} with no detail message.
-     */
+    /** Constructs a new {@code ChaincodeException} with no detail message. */
     public ChaincodeException() {
         super();
     }
 
     /**
-     * Constructs a new {@code ChaincodeException} with the specified detail
-     * message.
+     * Constructs a new {@code ChaincodeException} with the specified detail message.
      *
      * @param message the detail message.
      */
@@ -55,19 +47,17 @@ public ChaincodeException(final Throwable cause) {
     }
 
     /**
-     * Constructs a new {@code ChaincodeException} with the specified detail message
-     * and cause.
+     * Constructs a new {@code ChaincodeException} with the specified detail message and cause.
      *
      * @param message the detail message.
-     * @param cause   the cause.
+     * @param cause the cause.
      */
     public ChaincodeException(final String message, final Throwable cause) {
         super(message, cause);
     }
 
     /**
-     * Constructs a new {@code ChaincodeException} with the specified detail message
-     * and response payload.
+     * Constructs a new {@code ChaincodeException} with the specified detail message and response payload.
      *
      * @param message the detail message.
      * @param payload the response payload.
@@ -79,12 +69,11 @@ public ChaincodeException(final String message, final byte[] payload) {
     }
 
     /**
-     * Constructs a new {@code ChaincodeException} with the specified detail
-     * message, response payload and cause.
+     * Constructs a new {@code ChaincodeException} with the specified detail message, response payload and cause.
      *
      * @param message the detail message.
      * @param payload the response payload.
-     * @param cause   the cause.
+     * @param cause the cause.
      */
     public ChaincodeException(final String message, final byte[] payload, final Throwable cause) {
         super(message, cause);
@@ -93,8 +82,7 @@ public ChaincodeException(final String message, final byte[] payload, final Thro
     }
 
     /**
-     * Constructs a new {@code ChaincodeException} with the specified detail message
-     * and response payload.
+     * Constructs a new {@code ChaincodeException} with the specified detail message and response payload.
      *
      * @param message the detail message.
      * @param payload the response payload.
@@ -106,12 +94,11 @@ public ChaincodeException(final String message, final String payload) {
     }
 
     /**
-     * Constructs a new {@code ChaincodeException} with the specified detail
-     * message, response payload and cause.
+     * Constructs a new {@code ChaincodeException} with the specified detail message, response payload and cause.
      *
      * @param message the detail message.
      * @param payload the response payload.
-     * @param cause   the cause.
+     * @param cause the cause.
      */
     public ChaincodeException(final String message, final String payload, final Throwable cause) {
         super(message, cause);
@@ -122,12 +109,9 @@ public ChaincodeException(final String message, final String payload, final Thro
     /**
      * Returns the response payload or {@code null} if there is no response.
      *
-     * 

-     * The payload should represent the chaincode error in a way that client
-     * applications written in different programming languages can interpret. For
-     * example it could include a domain specific error code, in addition to any
-     * state information which would allow client applications to respond
-     * appropriately.
+     * 
The payload should represent the chaincode error in a way that client applications written in different
+     * programming languages can interpret. For example it could include a domain specific error code, in addition to
+     * any state information which would allow client applications to respond appropriately.
      *
      * @return the response payload or {@code null} if there is no response.
      */
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeServer.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeServer.java
index 8c8ff2b3..81c7ce29 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeServer.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeServer.java
@@ -8,9 +8,7 @@
 
 import java.io.IOException;
 
-/**
- * External chaincode server.
- */
+/** External chaincode server. */
 public interface ChaincodeServer {
 
     /**
@@ -21,9 +19,6 @@ public interface ChaincodeServer {
      */
     void start() throws IOException, InterruptedException;
 
-    /**
-     * shutdown now grpc server.
-     */
+    /** shutdown now grpc server. */
     void stop();
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeServerProperties.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeServerProperties.java
index 27c84257..af81bfb7 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeServerProperties.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeServerProperties.java
@@ -22,28 +22,33 @@ public final class ChaincodeServerProperties {
     private String trustCertCollectionFile;
     private boolean tlsEnabled = false;
 
-    /**
-     * Constructor using default configuration.
-     */
-    public ChaincodeServerProperties() {
-    }
+    /** Constructor using default configuration. */
+    public ChaincodeServerProperties() {}
 
     /**
      * Constructor.
+     *
      * @param portChaincodeServer ignored.
      * @param maxInboundMetadataSize the maximum metadata size allowed to be received by the server.
      * @param maxInboundMessageSize the maximum message size allowed to be received by the server.
      * @param maxConnectionAgeSeconds the maximum connection age in seconds.
      * @param keepAliveTimeoutSeconds timeout for a keep-alive ping request in seconds.
-     * @param permitKeepAliveTimeMinutes the most aggressive keep-alive time clients are permitted to configure in minutes.
+     * @param permitKeepAliveTimeMinutes the most aggressive keep-alive time clients are permitted to configure in
+     *     minutes.
      * @param keepAliveTimeMinutes delay before server sends a keep-alive in minutes.
-     * @param permitKeepAliveWithoutCalls whether clients are allowed to send keep-alive HTTP/2 PINGs even if there are no outstanding RPCs on the connection.
+     * @param permitKeepAliveWithoutCalls whether clients are allowed to send keep-alive HTTP/2 PINGs even if there are
+     *     no outstanding RPCs on the connection.
      */
     // checkstyle:ignore-next-line:ParameterNumber
     public ChaincodeServerProperties(
-            final int portChaincodeServer, final int maxInboundMetadataSize, final int maxInboundMessageSize,
-            final int maxConnectionAgeSeconds, final int keepAliveTimeoutSeconds, final int permitKeepAliveTimeMinutes,
-            final int keepAliveTimeMinutes, final boolean permitKeepAliveWithoutCalls) {
+            final int portChaincodeServer,
+            final int maxInboundMetadataSize,
+            final int maxInboundMessageSize,
+            final int maxConnectionAgeSeconds,
+            final int keepAliveTimeoutSeconds,
+            final int permitKeepAliveTimeMinutes,
+            final int keepAliveTimeMinutes,
+            final boolean permitKeepAliveWithoutCalls) {
 
         this.serverAddress = null;
         this.maxInboundMetadataSize = maxInboundMetadataSize;
@@ -57,6 +62,7 @@ public ChaincodeServerProperties(
 
     /**
      * The maximum size of metadata allowed to be received.
+     *
      * @return The maximum metadata size allowed.
      */
     public int getMaxInboundMetadataSize() {
@@ -65,6 +71,7 @@ public int getMaxInboundMetadataSize() {
 
     /**
      * Sets the maximum metadata size allowed to be received by the server.
+     *
      * @param maxInboundMetadataSize The new maximum size allowed for incoming metadata.
      */
     public void setMaxInboundMetadataSize(final int maxInboundMetadataSize) {
@@ -73,6 +80,7 @@ public void setMaxInboundMetadataSize(final int maxInboundMetadataSize) {
 
     /**
      * The maximum message size allowed to be received by the server.
+     *
      * @return the maximum message size allowed.
      */
     public int getMaxInboundMessageSize() {
@@ -81,6 +89,7 @@ public int getMaxInboundMessageSize() {
 
     /**
      * Sets the maximum message size allowed to be received by the server.
+     *
      * @param maxInboundMessageSize The new maximum size allowed for incoming messages.
      */
     public void setMaxInboundMessageSize(final int maxInboundMessageSize) {
@@ -89,6 +98,7 @@ public void setMaxInboundMessageSize(final int maxInboundMessageSize) {
 
     /**
      * The maximum connection age.
+     *
      * @return The maximum connection age in seconds.
      */
     public int getMaxConnectionAgeSeconds() {
@@ -97,6 +107,7 @@ public int getMaxConnectionAgeSeconds() {
 
     /**
      * Specify a maximum connection age.
+     *
      * @param maxConnectionAgeSeconds The maximum connection age in seconds.
      */
     public void setMaxConnectionAgeSeconds(final int maxConnectionAgeSeconds) {
@@ -105,6 +116,7 @@ public void setMaxConnectionAgeSeconds(final int maxConnectionAgeSeconds) {
 
     /**
      * The timeout for a keep-alive ping requests.
+     *
      * @return timeout in seconds.
      */
     public int getKeepAliveTimeoutSeconds() {
@@ -113,6 +125,7 @@ public int getKeepAliveTimeoutSeconds() {
 
     /**
      * Set the timeout for keep-alive ping requests.
+     *
      * @param keepAliveTimeoutSeconds timeout in seconds.
      */
     public void setKeepAliveTimeoutSeconds(final int keepAliveTimeoutSeconds) {
@@ -121,6 +134,7 @@ public void setKeepAliveTimeoutSeconds(final int keepAliveTimeoutSeconds) {
 
     /**
      * The most aggressive keep-alive time clients are permitted to configure.
+     *
      * @return time in minutes.
      */
     public int getPermitKeepAliveTimeMinutes() {
@@ -129,6 +143,7 @@ public int getPermitKeepAliveTimeMinutes() {
 
     /**
      * Specify the most aggressive keep-alive time clients are permitted to configure.
+     *
      * @param permitKeepAliveTimeMinutes time in minutes.
      */
     public void setPermitKeepAliveTimeMinutes(final int permitKeepAliveTimeMinutes) {
@@ -137,6 +152,7 @@ public void setPermitKeepAliveTimeMinutes(final int permitKeepAliveTimeMinutes)
 
     /**
      * The delay before the server sends a keep-alive.
+     *
      * @return delay in minutes.
      */
     public int getKeepAliveTimeMinutes() {
@@ -145,6 +161,7 @@ public int getKeepAliveTimeMinutes() {
 
     /**
      * Set the delay before the server sends a keep-alive.
+     *
      * @param keepAliveTimeMinutes delay in minutes.
      */
     public void setKeepAliveTimeMinutes(final int keepAliveTimeMinutes) {
@@ -152,7 +169,9 @@ public void setKeepAliveTimeMinutes(final int keepAliveTimeMinutes) {
     }
 
     /**
-     * Whether clients are allowed to send keep-alive HTTP/2 PINGs even if there are no outstanding RPCs on the connection.
+     * Whether clients are allowed to send keep-alive HTTP/2 PINGs even if there are no outstanding RPCs on the
+     * connection.
+     *
      * @return true if clients are allowed to send keep-alive requests without calls; otherwise false.
      */
     public boolean getPermitKeepAliveWithoutCalls() {
@@ -161,6 +180,7 @@ public boolean getPermitKeepAliveWithoutCalls() {
 
     /**
      * Get the server socket address.
+     *
      * @return a socket address.
      */
     public SocketAddress getServerAddress() {
@@ -169,6 +189,7 @@ public SocketAddress getServerAddress() {
 
     /**
      * Set the server socket address.
+     *
      * @param address a socket address.
      */
     public void setServerAddress(final SocketAddress address) {
@@ -176,7 +197,9 @@ public void setServerAddress(final SocketAddress address) {
     }
 
     /**
-     * Whether clients are allowed to send keep-alive HTTP/2 PINGs even if there are no outstanding RPCs on the connection.
+     * Whether clients are allowed to send keep-alive HTTP/2 PINGs even if there are no outstanding RPCs on the
+     * connection.
+     *
      * @return true if clients are allowed to send keep-alive requests without calls; otherwise false.
      */
     public boolean isPermitKeepAliveWithoutCalls() {
@@ -184,7 +207,9 @@ public boolean isPermitKeepAliveWithoutCalls() {
     }
 
     /**
-     * Specify whether clients are allowed to send keep-alive HTTP/2 PINGs even if there are no outstanding RPCs on the connection.
+     * Specify whether clients are allowed to send keep-alive HTTP/2 PINGs even if there are no outstanding RPCs on the
+     * connection.
+     *
      * @param permitKeepAliveWithoutCalls Whether to allow clients to send keep-alive requests without calls.
      */
     public void setPermitKeepAliveWithoutCalls(final boolean permitKeepAliveWithoutCalls) {
@@ -193,6 +218,7 @@ public void setPermitKeepAliveWithoutCalls(final boolean permitKeepAliveWithoutC
 
     /**
      * Password used to access the server key.
+     *
      * @return a password.
      */
     public String getKeyPassword() {
@@ -201,6 +227,7 @@ public String getKeyPassword() {
 
     /**
      * Set the password used to access the server key.
+     *
      * @param keyPassword a password.
      */
     public void setKeyPassword(final String keyPassword) {
@@ -209,6 +236,7 @@ public void setKeyPassword(final String keyPassword) {
 
     /**
      * Server keychain file name.
+     *
      * @return a file name.
      */
     public String getKeyCertChainFile() {
@@ -217,6 +245,7 @@ public String getKeyCertChainFile() {
 
     /**
      * Set the server keychain file name.
+     *
      * @param keyCertChainFile a file name.
      */
     public void setKeyCertChainFile(final String keyCertChainFile) {
@@ -225,6 +254,7 @@ public void setKeyCertChainFile(final String keyCertChainFile) {
 
     /**
      * Server key file name.
+     *
      * @return a file name.
      */
     public String getKeyFile() {
@@ -233,6 +263,7 @@ public String getKeyFile() {
 
     /**
      * Set the server key file name.
+     *
      * @param keyFile a file name.
      */
     public void setKeyFile(final String keyFile) {
@@ -241,6 +272,7 @@ public void setKeyFile(final String keyFile) {
 
     /**
      * Server trust certificate collection file name.
+     *
      * @return a file name.
      */
     public String getTrustCertCollectionFile() {
@@ -249,6 +281,7 @@ public String getTrustCertCollectionFile() {
 
     /**
      * Set the server trust certificate collection file name.
+     *
      * @param trustCertCollectionFile a file name.
      */
     public void setTrustCertCollectionFile(final String trustCertCollectionFile) {
@@ -257,6 +290,7 @@ public void setTrustCertCollectionFile(final String trustCertCollectionFile) {
 
     /**
      * Whether TLS is enabled for the server.
+     *
      * @return true if TLS is enabled; otherwise false.
      */
     public boolean isTlsEnabled() {
@@ -265,6 +299,7 @@ public boolean isTlsEnabled() {
 
     /**
      * Set whether TLS is enabled for the server.
+     *
      * @param tlsEnabled true to enable TLS; otherwise false.
      */
     public void setTlsEnabled(final boolean tlsEnabled) {
@@ -273,6 +308,7 @@ public void setTlsEnabled(final boolean tlsEnabled) {
 
     /**
      * Check that all the server property values are valid.
+     *
      * @throws IllegalArgumentException if any properties are not valid.
      */
     public void validate() {
@@ -280,30 +316,37 @@ public void validate() {
             throw new IllegalArgumentException("chaincodeServerProperties.getServerAddress() must be set");
         }
         if (this.getKeepAliveTimeMinutes() <= 0) {
-            throw new IllegalArgumentException("chaincodeServerProperties.getKeepAliveTimeMinutes() must be more then 0");
+            throw new IllegalArgumentException(
+                    "chaincodeServerProperties.getKeepAliveTimeMinutes() must be more then 0");
         }
         if (this.getKeepAliveTimeoutSeconds() <= 0) {
-            throw new IllegalArgumentException("chaincodeServerProperties.getKeepAliveTimeoutSeconds() must be more then 0");
+            throw new IllegalArgumentException(
+                    "chaincodeServerProperties.getKeepAliveTimeoutSeconds() must be more then 0");
         }
         if (this.getPermitKeepAliveTimeMinutes() <= 0) {
-            throw new IllegalArgumentException("chaincodeServerProperties.getPermitKeepAliveTimeMinutes() must be more then 0");
+            throw new IllegalArgumentException(
+                    "chaincodeServerProperties.getPermitKeepAliveTimeMinutes() must be more then 0");
         }
         if (this.getMaxConnectionAgeSeconds() <= 0) {
-            throw new IllegalArgumentException("chaincodeServerProperties.getMaxConnectionAgeSeconds() must be more then 0");
+            throw new IllegalArgumentException(
+                    "chaincodeServerProperties.getMaxConnectionAgeSeconds() must be more then 0");
         }
         if (this.getMaxInboundMetadataSize() <= 0) {
-            throw new IllegalArgumentException("chaincodeServerProperties.getMaxInboundMetadataSize() must be more then 0");
+            throw new IllegalArgumentException(
+                    "chaincodeServerProperties.getMaxInboundMetadataSize() must be more then 0");
         }
         if (this.getMaxInboundMessageSize() <= 0) {
-            throw new IllegalArgumentException("chaincodeServerProperties.getMaxInboundMessageSize() must be more then 0");
+            throw new IllegalArgumentException(
+                    "chaincodeServerProperties.getMaxInboundMessageSize() must be more then 0");
         }
-        if (this.isTlsEnabled() && (this.getKeyCertChainFile() == null || this.getKeyCertChainFile().isEmpty()
-            || this.getKeyFile() == null || this.getKeyFile().isEmpty())) {
+        if (this.isTlsEnabled()
+                && (this.getKeyCertChainFile() == null
+                        || this.getKeyCertChainFile().isEmpty()
+                        || this.getKeyFile() == null
+                        || this.getKeyFile().isEmpty())) {
             throw new IllegalArgumentException("if chaincodeServerProperties.isTlsEnabled() must be more specified"
-                + " chaincodeServerProperties.getKeyCertChainFile() and chaincodeServerProperties.getKeyFile()"
-                + " with optional chaincodeServerProperties.getKeyPassword()");
+                    + " chaincodeServerProperties.getKeyCertChainFile() and chaincodeServerProperties.getKeyFile()"
+                    + " with optional chaincodeServerProperties.getKeyPassword()");
         }
     }
-
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeStub.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeStub.java
index 7c77f5da..8c223fc4 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeStub.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeStub.java
@@ -13,7 +13,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeEvent;
 import org.hyperledger.fabric.protos.peer.SignedProposal;
 import org.hyperledger.fabric.shim.Chaincode.Response;
@@ -24,23 +23,21 @@
 import org.hyperledger.fabric.shim.ledger.QueryResultsIteratorWithMetadata;
 
 /**
- * An object which manages the transaction context, provides access to state variables, and supports calls to other chaincode implementations.
+ * An object which manages the transaction context, provides access to state variables, and supports calls to other
+ * chaincode implementations.
  */
 public interface ChaincodeStub {
 
     /**
-     * Returns the arguments corresponding to the call to
-     * {@link Chaincode#init(ChaincodeStub)} or
-     * {@link Chaincode#invoke(ChaincodeStub)}, each argument represented as byte
-     * array.
+     * Returns the arguments corresponding to the call to {@link Chaincode#init(ChaincodeStub)} or
+     * {@link Chaincode#invoke(ChaincodeStub)}, each argument represented as byte array.
      *
      * @return a list of arguments (bytes arrays)
      */
     List getArgs();
 
     /**
-     * Returns the arguments corresponding to the call to
-     * {@link Chaincode#init(ChaincodeStub)} or
+     * Returns the arguments corresponding to the call to {@link Chaincode#init(ChaincodeStub)} or
      * {@link Chaincode#invoke(ChaincodeStub)}, cast to UTF-8 string.
      *
      * @return a list of arguments cast to UTF-8 strings
@@ -48,22 +45,19 @@ public interface ChaincodeStub {
     List getStringArgs();
 
     /**
-     * A convenience method that returns the first argument of the chaincode
-     * invocation for use as a function name.
-     * 

-     * The bytes of the first argument are decoded as a UTF-8 string.
+     * A convenience method that returns the first argument of the chaincode invocation for use as a function name.
+     *
+     * 
The bytes of the first argument are decoded as a UTF-8 string.
      *
      * @return the function name
      */
     String getFunction();
 
     /**
-     * A convenience method that returns all except the first argument of the
-     * chaincode invocation for use as the parameters to the function returned by
-     * #{@link ChaincodeStub#getFunction()}.
-     * 

-     * The bytes of the arguments are decoded as a UTF-8 strings and returned as a
-     * list of string parameters.
+     * A convenience method that returns all except the first argument of the chaincode invocation for use as the
+     * parameters to the function returned by #{@link ChaincodeStub#getFunction()}.
+     *
+     * 
The bytes of the arguments are decoded as a UTF-8 strings and returned as a list of string parameters.
      *
      * @return a list of parameters
      */
@@ -71,9 +65,8 @@ public interface ChaincodeStub {
 
     /**
      * Returns the transaction id for the current chaincode invocation request.
-     * 

-     * The transaction id uniquely identifies the transaction within the scope of
-     * the channel.
+     *
+     * 
The transaction id uniquely identifies the transaction within the scope of the channel.
      *
      * @return the transaction id
      */
@@ -81,49 +74,45 @@ public interface ChaincodeStub {
 
     /**
      * Returns the channel id for the current proposal.
-     * 

-     * This would be the 'channel_id' of the transaction proposal except where the
-     * chaincode is calling another on a different channel.
+     *
+     * 
This would be the 'channel_id' of the transaction proposal except where the chaincode is calling another on a
+     * different channel.
      *
      * @return the channel id
      */
     String getChannelId();
 
     /**
-     * Locally calls the specified chaincode invoke() using the same
-     * transaction context.
-     * 

-     * chaincode calling chaincode doesn't create a new transaction message.
-     * 

-     * If the called chaincode is on the same channel, it simply adds the called
-     * chaincode read set and write set to the calling transaction.
-     * 

-     * If the called chaincode is on a different channel, only the Response is
-     * returned to the calling chaincode; any putState calls from the
-     * called chaincode will not have any effect on the ledger; that is, the called
-     * chaincode on a different channel will not have its read set and write set
-     * applied to the transaction. Only the calling chaincode's read set and write
-     * set will be applied to the transaction. Effectively the called chaincode on a
-     * different channel is a `Query`, which does not participate in state
-     * validation checks in subsequent commit phase.
-     * 

-     * If `channel` is empty, the caller's channel is assumed.
-     * 

-     * Invoke another chaincode using the same transaction context.
+     * Locally calls the specified chaincode invoke() using the same transaction context.
+     *
+     * 
chaincode calling chaincode doesn't create a new transaction message.
+     *
+     * 
If the called chaincode is on the same channel, it simply adds the called chaincode read set and write set to
+     * the calling transaction.
+     *
+     * 
If the called chaincode is on a different channel, only the Response is returned to the calling chaincode; any
+     * putState calls from the called chaincode will not have any effect on the ledger; that is, the called
+     * chaincode on a different channel will not have its read set and write set applied to the transaction. Only the
+     * calling chaincode's read set and write set will be applied to the transaction. Effectively the called chaincode
+     * on a different channel is a `Query`, which does not participate in state validation checks in subsequent commit
+     * phase.
+     *
+     * 
If `channel` is empty, the caller's channel is assumed.
+     *
+     * 
Invoke another chaincode using the same transaction context.
      *
      * @param chaincodeName Name of chaincode to be invoked.
-     * @param args          Arguments to pass on to the called chaincode.
-     * @param channel       If not specified, the caller's channel is assumed.
+     * @param args Arguments to pass on to the called chaincode.
+     * @param channel If not specified, the caller's channel is assumed.
      * @return {@link Response} object returned by called chaincode
      */
     Response invokeChaincode(String chaincodeName, List args, String channel);
 
     /**
      * Returns the value of the specified key from the ledger.
-     * 

-     * Note that getState doesn't read data from the writeset, which has not been
-     * committed to the ledger. In other words, GetState doesn't consider data
-     * modified by PutState that has not been committed.
+     *
+     * 
Note that getState doesn't read data from the writeset, which has not been committed to the ledger. In other
+     * words, GetState doesn't consider data modified by PutState that has not been committed.
      *
      * @param key name of the value
      * @return value the value read from the ledger
@@ -131,9 +120,8 @@ public interface ChaincodeStub {
     byte[] getState(String key);
 
     /**
-     * retrieves the key-level endorsement policy for key. Note that
-     * this will introduce a read dependency on key in the
-     * transaction's readset.
+     * retrieves the key-level endorsement policy for key. Note that this will introduce a read dependency
+     * on key in the transaction's readset.
      *
      * @param key key to get key level endorsement
      * @return endorsement policy
@@ -141,15 +129,14 @@ public interface ChaincodeStub {
     byte[] getStateValidationParameter(String key);
 
     /**
-     * Puts the specified key and value into the
-     * transaction's writeset as a data-write proposal.
-     * 

-     * putState doesn't effect the ledger until the transaction is validated and
-     * successfully committed. Simple keys must not be an empty string and must not
-     * start with 0x00 character, in order to avoid range query collisions with
+     * Puts the specified key and value into the transaction's writeset as a data-write
+     * proposal.
+     *
+     * 
putState doesn't effect the ledger until the transaction is validated and successfully committed. Simple keys
+     * must not be an empty string and must not start with 0x00 character, in order to avoid range query collisions with
      * composite keys
      *
-     * @param key   name of the value
+     * @param key name of the value
      * @param value the value to write to the ledger
      */
     void putState(String key, byte[] value);
@@ -157,79 +144,66 @@ public interface ChaincodeStub {
     /**
      * Sets the key-level endorsement policy for key.
      *
-     * @param key   key to set key level endorsement
+     * @param key key to set key level endorsement
      * @param value endorsement policy
      */
     void setStateValidationParameter(String key, byte[] value);
 
     /**
-     * Records the specified key to be deleted in the writeset of the
-     * transaction proposal.
-     * 

-     * The key and its value will be deleted from the ledger when the
-     * transaction is validated and successfully committed.
+     * Records the specified key to be deleted in the writeset of the transaction proposal.
+     *
+     * 
The key and its value will be deleted from the ledger when the transaction is validated and
+     * successfully committed.
      *
      * @param key name of the value to be deleted
      */
     void delState(String key);
 
     /**
-     * Returns all existing keys, and their values, that are lexicographically
-     * between startkey (inclusive) and the endKey
-     * (exclusive).
-     * 

-     * The keys are returned by the iterator in lexical order. Note that startKey
-     * and endKey can be empty string, which implies unbounded range query on start
-     * or end.
-     * 

-     * Call close() on the returned {@link QueryResultsIterator#close()} object when
-     * done.
+     * Returns all existing keys, and their values, that are lexicographically between startkey (inclusive)
+     * and the endKey (exclusive).
+     *
+     * 
The keys are returned by the iterator in lexical order. Note that startKey and endKey can be empty string,
+     * which implies unbounded range query on start or end.
+     *
+     * 
Call close() on the returned {@link QueryResultsIterator#close()} object when done.
      *
      * @param startKey key as the start of the key range (inclusive)
-     * @param endKey   key as the end of the key range (exclusive)
+     * @param endKey key as the end of the key range (exclusive)
      * @return an {@link Iterable} of {@link KeyValue}
      */
     QueryResultsIterator getStateByRange(String startKey, String endKey);
 
     /**
-     * Returns a range iterator over a set of keys in the ledger. The iterator can
-     * be used to fetch keys between the startKey (inclusive) and
-     * endKey (exclusive). When an empty string is passed as a value to
-     * the bookmark argument, the returned iterator can be used to
-     * fetch the first pageSize keys between the startKey
-     * and endKey. When the bookmark is a non-empty
-     * string, the iterator can be used to fetch first pageSize keys
-     * between the bookmark and endKey. Note that only the
-     * bookmark present in a prior page of query results
-     * ({@link org.hyperledger.fabric.protos.peer.QueryResponseMetadata})
-     * can be used as a value to the bookmark argument. Otherwise, an empty string
-     * must be passed as bookmark. The keys are returned by the iterator in lexical
-     * order. Note that startKey and endKey can be empty
-     * string, which implies unbounded range query on start or end. This call is
-     * only supported in a read only transaction.
+     * Returns a range iterator over a set of keys in the ledger. The iterator can be used to fetch keys between the
+     * startKey (inclusive) and endKey (exclusive). When an empty string is passed as a value
+     * to the bookmark argument, the returned iterator can be used to fetch the first pageSize
+     * keys between the startKey and endKey. When the bookmark is a non-empty
+     * string, the iterator can be used to fetch first pageSize keys between the bookmark and
+     * endKey. Note that only the bookmark present in a prior page of query results
+     * ({@link org.hyperledger.fabric.protos.peer.QueryResponseMetadata}) can be used as a value to the bookmark
+     * argument. Otherwise, an empty string must be passed as bookmark. The keys are returned by the iterator in lexical
+     * order. Note that startKey and endKey can be empty string, which implies unbounded range
+     * query on start or end. This call is only supported in a read only transaction.
      *
      * @param startKey the start key
-     * @param endKey   the end key
+     * @param endKey the end key
      * @param pageSize the page size
      * @param bookmark the bookmark
      * @return QueryIterator
      */
-    QueryResultsIteratorWithMetadata getStateByRangeWithPagination(String startKey, String endKey, int pageSize, String bookmark);
+    QueryResultsIteratorWithMetadata getStateByRangeWithPagination(
+            String startKey, String endKey, int pageSize, String bookmark);
 
     /**
-     * Returns all existing keys, and their values, that are prefixed by the
-     * specified partial {@link CompositeKey}.
-     * 

-     * If a full composite key is specified, it will not match itself, resulting in
-     * no keys being returned.
-     * 

-     * This method takes responsibility to correctly parse the {@link CompositeKey}
-     * from a String and behaves exactly as
-     * {@link ChaincodeStub#getStateByPartialCompositeKey(CompositeKey)}.
-     * 

-     * 

-     * Call close() on the returned {@link QueryResultsIterator#close()} object when
-     * done.
+     * Returns all existing keys, and their values, that are prefixed by the specified partial {@link CompositeKey}.
+     *
+     * 
If a full composite key is specified, it will not match itself, resulting in no keys being returned.
+     *
+     * 
This method takes responsibility to correctly parse the {@link CompositeKey} from a String and behaves exactly
+     * as {@link ChaincodeStub#getStateByPartialCompositeKey(CompositeKey)}.
+     *
+     * 
Call close() on the returned {@link QueryResultsIterator#close()} object when done.
      *
      * @param compositeKey partial composite key
      * @return an {@link Iterable} of {@link KeyValue}
@@ -237,21 +211,15 @@ public interface ChaincodeStub {
     QueryResultsIterator getStateByPartialCompositeKey(String compositeKey);
 
     /**
-     * Returns all existing keys, and their values, that are prefixed by the
-     * specified partial {@link CompositeKey}.
-     * 

-     * It combines the attributes and the objectType to form a partial composite
-     * key.
-     * 

-     * If a full composite key is specified, it will not match itself, resulting in
-     * no keys being returned.
-     * 

-     * This method takes responsibility to correctly combine Object type and
-     * attributes creating a {@link CompositeKey} and behaves exactly as
-     * {@link ChaincodeStub#getStateByPartialCompositeKey(CompositeKey)}.
-     * 

-     * Call close() on the returned {@link QueryResultsIterator#close()} object when
-     * done.
+     * Returns all existing keys, and their values, that are prefixed by the specified partial {@link CompositeKey}.
+     *
+     * 
It combines the attributes and the objectType to form a partial composite key.
+     *
+     * 
If a full composite key is specified, it will not match itself, resulting in no keys being returned.
+     *
+     * 
This method takes responsibility to correctly combine Object type and attributes creating a
+     * {@link CompositeKey} and behaves exactly as {@link ChaincodeStub#getStateByPartialCompositeKey(CompositeKey)}.
+     * Call close() on the returned {@link QueryResultsIterator#close()} object when done.
      *
      * @param objectType ObjectType of the compositeKey
      * @param attributes Attributes of the composite key
@@ -260,11 +228,9 @@ public interface ChaincodeStub {
     QueryResultsIterator getStateByPartialCompositeKey(String objectType, String... attributes);
 
     /**
-     * Returns all existing keys, and their values, that are prefixed by the
-     * specified partial {@link CompositeKey}.
-     * 

-     * If a full composite key is specified, it will not match itself, resulting in
-     * no keys being returned.
+     * Returns all existing keys, and their values, that are prefixed by the specified partial {@link CompositeKey}.
+     *
+     * 
If a full composite key is specified, it will not match itself, resulting in no keys being returned.
      *
      * @param compositeKey partial composite key
      * @return an {@link Iterable} of {@link KeyValue}
@@ -272,36 +238,32 @@ public interface ChaincodeStub {
     QueryResultsIterator getStateByPartialCompositeKey(CompositeKey compositeKey);
 
     /**
-     * Queries the state in the ledger based on a given partial composite key. This
-     * function returns an iterator which can be used to iterate over the composite
-     * keys whose prefix matches the given partial composite key.
-     * 

-     * When an empty string is passed as a value to the bookmark
-     * argument, the returned iterator can be used to fetch the first
-     * pageSize composite keys whose prefix matches the given partial
-     * composite key.
-     * 

-     * When the bookmark is a non-empty string, the iterator can be
-     * used to fetch first pageSize keys between the
-     * bookmark (inclusive) and and the last matching composite key.
-     * 

-     * Note that only the bookmark present in a prior page of query results
-     * ({@link org.hyperledger.fabric.protos.peer.QueryResponseMetadata})
-     * can be used as a value to the bookmark argument. Otherwise, an empty string
-     * must be passed as bookmark.
-     * 

-     * This call is only supported in a read only transaction.
+     * Queries the state in the ledger based on a given partial composite key. This function returns an iterator which
+     * can be used to iterate over the composite keys whose prefix matches the given partial composite key.
+     *
+     * 
When an empty string is passed as a value to the bookmark argument, the returned iterator can be
+     * used to fetch the first pageSize composite keys whose prefix matches the given partial composite
+     * key.
+     *
+     * 
When the bookmark is a non-empty string, the iterator can be used to fetch first pageSize
+     *  keys between the bookmark (inclusive) and and the last matching composite key.
+     *
+     * 
Note that only the bookmark present in a prior page of query results
+     * ({@link org.hyperledger.fabric.protos.peer.QueryResponseMetadata}) can be used as a value to the bookmark
+     * argument. Otherwise, an empty string must be passed as bookmark.
+     *
+     * 
This call is only supported in a read only transaction.
      *
      * @param compositeKey the composite key
-     * @param pageSize     the page size
-     * @param bookmark     the bookmark
+     * @param pageSize the page size
+     * @param bookmark the bookmark
      * @return QueryIterator
      */
-    QueryResultsIteratorWithMetadata getStateByPartialCompositeKeyWithPagination(CompositeKey compositeKey, int pageSize, String bookmark);
+    QueryResultsIteratorWithMetadata getStateByPartialCompositeKeyWithPagination(
+            CompositeKey compositeKey, int pageSize, String bookmark);
 
     /**
-     * Given a set of attributes, this method combines these attributes to return a
-     * composite key.
+     * Given a set of attributes, this method combines these attributes to return a composite key.
      *
      * @param objectType A string used as the prefix of the resulting key
      * @param attributes List of attribute values to concatenate into the key
@@ -319,53 +281,46 @@ public interface ChaincodeStub {
 
     /**
      * Performs a "rich" query against a state database.
-     * 

-     * It is only supported for state databases that support rich query, e.g.
-     * CouchDB. The query string is in the native syntax of the underlying state
-     * database. An {@link QueryResultsIterator} is returned which can be used to
+     *
+     * 
It is only supported for state databases that support rich query, e.g. CouchDB. The query string is in the
+     * native syntax of the underlying state database. An {@link QueryResultsIterator} is returned which can be used to
      * iterate (next) over the query result set.
      *
-     * @param query query string in a syntax supported by the underlying state
-     *              database
+     * @param query query string in a syntax supported by the underlying state database
      * @return {@link QueryResultsIterator} object contains query results
-     * @throws UnsupportedOperationException if the underlying state database does
-     *                                       not support rich queries.
+     * @throws UnsupportedOperationException if the underlying state database does not support rich queries.
      */
     QueryResultsIterator getQueryResult(String query);
 
     /**
-     * Performs a "rich" query against a state database. It is only supported for
-     * state databases that support rich query, e.g., CouchDB. The query string is
-     * in the native syntax of the underlying state database. An iterator is
-     * returned which can be used to iterate over keys in the query result set. When
-     * an empty string is passed as a value to the bookmark argument,
-     * the returned iterator can be used to fetch the first pageSize of
-     * query results..
-     * 

-     * When the bookmark is a non-empty string, the iterator can be
-     * used to fetch first pageSize keys between the
-     * bookmark (inclusive) and the last key in the query result.
-     * 

-     * Note that only the bookmark present in a prior page of query results
-     * ({@link org.hyperledger.fabric.protos.peer.QueryResponseMetadata})
-     * can be used as a value to the bookmark argument. Otherwise, an empty string
-     * must be passed as bookmark.
-     * 

-     * This call is only supported in a read only transaction.
-     *
-     * @param query    the query
+     * Performs a "rich" query against a state database. It is only supported for state databases that support rich
+     * query, e.g., CouchDB. The query string is in the native syntax of the underlying state database. An iterator is
+     * returned which can be used to iterate over keys in the query result set. When an empty string is passed as a
+     * value to the bookmark argument, the returned iterator can be used to fetch the first pageSize
+     *  of query results..
+     *
+     * 
When the bookmark is a non-empty string, the iterator can be used to fetch first pageSize
+     *  keys between the bookmark (inclusive) and the last key in the query result.
+     *
+     * 
Note that only the bookmark present in a prior page of query results
+     * ({@link org.hyperledger.fabric.protos.peer.QueryResponseMetadata}) can be used as a value to the bookmark
+     * argument. Otherwise, an empty string must be passed as bookmark.
+     *
+     * 
This call is only supported in a read only transaction.
+     *
+     * @param query the query
      * @param pageSize the page size
      * @param bookmark the bookmark
      * @return QueryIterator
      */
-    QueryResultsIteratorWithMetadata getQueryResultWithPagination(String query, int pageSize, String bookmark);
+    QueryResultsIteratorWithMetadata getQueryResultWithPagination(
+            String query, int pageSize, String bookmark);
 
     /**
      * Returns a history of key values across time.
-     * 

-     * For each historic key update, the historic value and associated transaction
-     * id and timestamp are returned. The timestamp is the timestamp provided by the
-     * client in the proposal header. This method requires peer configuration
+     *
+     * 
For each historic key update, the historic value and associated transaction id and timestamp are returned. The
+     * timestamp is the timestamp provided by the client in the proposal header. This method requires peer configuration
      * core.ledger.history.enableHistoryDatabase to be true.
      *
      * @param key The state variable key
@@ -374,227 +329,197 @@ public interface ChaincodeStub {
     QueryResultsIterator getHistoryForKey(String key);
 
     /**
-     * Returns the value of the specified key from the specified
-     * collection.
-     * 

-     * Note that {@link #getPrivateData(String, String)} doesn't read data from the
-     * private writeset, which has not been committed to the
-     * collection. In other words,
-     * {@link #getPrivateData(String, String)} doesn't consider data modified by
-     * {@link #putPrivateData(String, String, byte[])} * that has not been
-     * committed.
+     * Returns the value of the specified key from the specified collection.
+     *
+     * 
Note that {@link #getPrivateData(String, String)} doesn't read data from the private writeset, which has not
+     * been committed to the collection. In other words, {@link #getPrivateData(String, String)} doesn't
+     * consider data modified by {@link #putPrivateData(String, String, byte[])} * that has not been committed.
      *
      * @param collection name of the collection
-     * @param key        name of the value
+     * @param key name of the value
      * @return value the value read from the collection
      */
     byte[] getPrivateData(String collection, String key);
 
     /**
      * @param collection name of the collection
-     * @param key        name of the value
+     * @param key name of the value
      * @return the private data hash
      */
     byte[] getPrivateDataHash(String collection, String key);
 
     /**
-     * Retrieves the key-level endorsement policy for the private data specified by
-     * key. Note that this introduces a read dependency on
-     * key in the transaction's readset.
+     * Retrieves the key-level endorsement policy for the private data specified by key. Note that this
+     * introduces a read dependency on key in the transaction's readset.
      *
      * @param collection name of the collection
-     * @param key        key to get endorsement policy
+     * @param key key to get endorsement policy
      * @return Key Level endorsement as byte array
      */
     byte[] getPrivateDataValidationParameter(String collection, String key);
 
     /**
-     * Puts the specified key and value into the
-     * transaction's private writeset.
-     * 

-     * Note that only hash of the private writeset goes into the transaction
-     * proposal response (which is sent to the client who issued the transaction)
-     * and the actual private writeset gets temporarily stored in a transient store.
-     * putPrivateData doesn't effect the collection until the
-     * transaction is validated and successfully committed. Simple keys must not be
-     * an empty string and must not start with null character (0x00), in order to
-     * avoid range query collisions with composite keys, which internally get
-     * prefixed with 0x00 as composite key namespace.
+     * Puts the specified key and value into the transaction's private writeset.
+     *
+     * 
Note that only hash of the private writeset goes into the transaction proposal response (which is sent to the
+     * client who issued the transaction) and the actual private writeset gets temporarily stored in a transient store.
+     * putPrivateData doesn't effect the collection until the transaction is validated and successfully
+     * committed. Simple keys must not be an empty string and must not start with null character (0x00), in order to
+     * avoid range query collisions with composite keys, which internally get prefixed with 0x00 as composite key
+     * namespace.
      *
      * @param collection name of the collection
-     * @param key        name of the value
-     * @param value      the value to write to the ledger
+     * @param key name of the value
+     * @param value the value to write to the ledger
      */
     void putPrivateData(String collection, String key, byte[] value);
 
     /**
-     * Sets the key-level endorsement policy for the private data specified by
-     * key.
+     * Sets the key-level endorsement policy for the private data specified by key.
      *
      * @param collection name of the collection
-     * @param key        key to set endorsement policy
-     * @param value      endorsement policy
+     * @param key key to set endorsement policy
+     * @param value endorsement policy
      */
     void setPrivateDataValidationParameter(String collection, String key, byte[] value);
 
     /**
-     * Records the specified key to be deleted in the private writeset
-     * of the transaction.
-     * 

-     * Note that only hash of the private writeset goes into the transaction
-     * proposal response (which is sent to the client who issued the transaction)
-     * and the actual private writeset gets temporarily stored in a transient store.
-     * The key and its value will be deleted from the collection when
-     * the transaction is validated and successfully committed.
+     * Records the specified key to be deleted in the private writeset of the transaction.
+     *
+     * 
Note that only hash of the private writeset goes into the transaction proposal response (which is sent to the
+     * client who issued the transaction) and the actual private writeset gets temporarily stored in a transient store.
+     * The key and its value will be deleted from the collection when the transaction is validated and
+     * successfully committed.
      *
      * @param collection name of the collection
-     * @param key        name of the value to be deleted
+     * @param key name of the value to be deleted
      */
     void delPrivateData(String collection, String key);
 
     /**
-     * Reqauests purging of the specified key to be from
-     * the private data stores.
-     * 

-     * Note that only hash of the private writeset goes into the transaction
-     * proposal response (which is sent to the client who issued the transaction)
-     * and the actual private writeset gets temporarily stored in a transient store.
-     * The key and its value will be purged from the collection. This is an
-     * asynchronous activity.
-     * 

-     * Purge is a complete removal of the history of the key. There is existing purge
-     * possible mased on block height. This API allows the contract to be pro-active in
-     * requesting data be purged. This can contribute towards meeting privacy requirements.
+     * Reqauests purging of the specified key to be from the private data stores.
+     *
+     * 
Note that only hash of the private writeset goes into the transaction proposal response (which is sent to the
+     * client who issued the transaction) and the actual private writeset gets temporarily stored in a transient store.
+     * The key and its value will be purged from the collection. This is an asynchronous activity.
+     *
+     * 
Purge is a complete removal of the history of the key. There is existing purge possible mased on block height.
+     * This API allows the contract to be pro-active in requesting data be purged. This can contribute towards meeting
+     * privacy requirements.
      *
      * @param collection name of the collection
-     * @param key        name of the value to be deleted
+     * @param key name of the value to be deleted
      */
     void purgePrivateData(String collection, String key);
 
     /**
-     * Returns all existing keys, and their values, that are lexicographically
-     * between startkey (inclusive) and the endKey
-     * (exclusive) in a given private collection.
-     * 

-     * Note that startKey and endKey can be empty string, which implies unbounded
-     * range query on start or end. The query is re-executed during validation phase
-     * to ensure result set has not changed since transaction endorsement (phantom
-     * reads detected).
+     * Returns all existing keys, and their values, that are lexicographically between startkey (inclusive)
+     * and the endKey (exclusive) in a given private collection.
+     *
+     * 
Note that startKey and endKey can be empty string, which implies unbounded range query on start or end. The
+     * query is re-executed during validation phase to ensure result set has not changed since transaction endorsement
+     * (phantom reads detected).
      *
      * @param collection name of the collection
-     * @param startKey   private data variable key as the start of the key range
-     *                   (inclusive)
-     * @param endKey     private data variable key as the end of the key range
-     *                   (exclusive)
+     * @param startKey private data variable key as the start of the key range (inclusive)
+     * @param endKey private data variable key as the end of the key range (exclusive)
      * @return an {@link Iterable} of {@link KeyValue}
      */
     QueryResultsIterator getPrivateDataByRange(String collection, String startKey, String endKey);
 
     /**
-     * Returns all existing keys, and their values, that are prefixed by the
-     * specified partial {@link CompositeKey} in a given private collection.
-     * 

-     * If a full composite key is specified, it will not match itself, resulting in
-     * no keys being returned.
-     * 

-     * The query is re-executed during validation phase to ensure result set has not
-     * changed since transaction endorsement (phantom reads detected).
-     * 

-     * This method takes responsibility to correctly parse the {@link CompositeKey}
-     * from a String and behaves exactly as
-     * {@link ChaincodeStub#getPrivateDataByPartialCompositeKey(String, CompositeKey)}.
-     * 

-     *
-     * @param collection   name of the collection
+     * Returns all existing keys, and their values, that are prefixed by the specified partial {@link CompositeKey} in a
+     * given private collection.
+     *
+     * 
If a full composite key is specified, it will not match itself, resulting in no keys being returned.
+     *
+     * 
The query is re-executed during validation phase to ensure result set has not changed since transaction
+     * endorsement (phantom reads detected).
+     *
+     * 
This method takes responsibility to correctly parse the {@link CompositeKey} from a String and behaves exactly
+     * as {@link ChaincodeStub#getPrivateDataByPartialCompositeKey(String, CompositeKey)}.
+     *
+     * @param collection name of the collection
      * @param compositeKey partial composite key
      * @return an {@link Iterable} of {@link KeyValue}
      */
     QueryResultsIterator getPrivateDataByPartialCompositeKey(String collection, String compositeKey);
 
     /**
-     * Returns all existing keys, and their values, that are prefixed by the
-     * specified partial {@link CompositeKey} in a given private collection.
-     * 

-     * If a full composite key is specified, it will not match itself, resulting in
-     * no keys being returned.
-     * 

-     * The query is re-executed during validation phase to ensure result set has not
-     * changed since transaction endorsement (phantom reads detected).
+     * Returns all existing keys, and their values, that are prefixed by the specified partial {@link CompositeKey} in a
+     * given private collection.
+     *
+     * 
If a full composite key is specified, it will not match itself, resulting in no keys being returned.
+     *
+     * 
The query is re-executed during validation phase to ensure result set has not changed since transaction
+     * endorsement (phantom reads detected).
      *
-     * @param collection   name of the collection
+     * @param collection name of the collection
      * @param compositeKey partial composite key
      * @return an {@link Iterable} of {@link KeyValue}
      */
     QueryResultsIterator getPrivateDataByPartialCompositeKey(String collection, CompositeKey compositeKey);
 
     /**
-     * Returns all existing keys, and their values, that are prefixed by the
-     * specified partial {@link CompositeKey} in a given private collection.
-     * 

-     * If a full composite key is specified, it will not match itself, resulting in
-     * no keys being returned.
-     * 

-     * The query is re-executed during validation phase to ensure result set has not
-     * changed since transaction endorsement (phantom reads detected).
-     * 

-     * This method takes responsibility to correctly combine Object type and
-     * attributes creating a {@link CompositeKey} and behaves exactly as
-     * {@link ChaincodeStub#getPrivateDataByPartialCompositeKey(String, CompositeKey)}.
-     * 

+     * Returns all existing keys, and their values, that are prefixed by the specified partial {@link CompositeKey} in a
+     * given private collection.
+     *
+     * 
If a full composite key is specified, it will not match itself, resulting in no keys being returned.
+     *
+     * 
The query is re-executed during validation phase to ensure result set has not changed since transaction
+     * endorsement (phantom reads detected).
+     *
+     * 
This method takes responsibility to correctly combine Object type and attributes creating a
+     * {@link CompositeKey} and behaves exactly as {@link ChaincodeStub#getPrivateDataByPartialCompositeKey(String,
+     * CompositeKey)}.
      *
      * @param collection name of the collection
      * @param objectType ObjectType of the compositeKey
      * @param attributes Attributes of the composite key
      * @return an {@link Iterable} of {@link KeyValue}
      */
-    QueryResultsIterator getPrivateDataByPartialCompositeKey(String collection, String objectType, String... attributes);
+    QueryResultsIterator getPrivateDataByPartialCompositeKey(
+            String collection, String objectType, String... attributes);
 
     /**
      * Perform a rich query against a given private collection.
-     * 

-     * It is only supported for state databases that support rich query,
-     * e.g.CouchDB. The query string is in the native syntax of the underlying state
-     * database. An iterator is returned which can be used to iterate (next) over
-     * the query result set. The query is NOT re-executed during validation phase,
-     * phantom reads are not detected. That is, other committed transactions may
-     * have added, updated, or removed keys that impact the result set, and this
-     * would not be detected at validation/commit time. Applications susceptible to
-     * this should therefore not use GetQueryResult as part of transactions that
-     * update ledger, and should limit use to read-only chaincode operations.
+     *
+     * 
It is only supported for state databases that support rich query, e.g.CouchDB. The query string is in the
+     * native syntax of the underlying state database. An iterator is returned which can be used to iterate (next) over
+     * the query result set. The query is NOT re-executed during validation phase, phantom reads are not detected. That
+     * is, other committed transactions may have added, updated, or removed keys that impact the result set, and this
+     * would not be detected at validation/commit time. Applications susceptible to this should therefore not use
+     * GetQueryResult as part of transactions that update ledger, and should limit use to read-only chaincode
+     * operations.
      *
      * @param collection name of the collection
-     * @param query      query string in a syntax supported by the underlying state
-     *                   database
+     * @param query query string in a syntax supported by the underlying state database
      * @return {@link QueryResultsIterator} object contains query results
-     * @throws UnsupportedOperationException if the underlying state database does
-     *                                       not support rich queries.
+     * @throws UnsupportedOperationException if the underlying state database does not support rich queries.
      */
     QueryResultsIterator getPrivateDataQueryResult(String collection, String query);
 
     /**
-     * Allows the chaincode to propose an event on the transaction proposal response.
-     * When the transaction is included in a block and the block is successfully committed to the ledger,
-     * the block event (including transaction level chaincode events)
-     * will be delivered to the current client application event listeners that have been registered with the peer's event producer.
-     * Consult each SDK's documentation for details.
-     * Only a single chaincode event can be included in a transaction.
-     * If setEvent() is called multiple times only the last event will be included in the transaction.
-     * The event must originate from the outer-most invoked chaincode in chaincode-to-chaincode scenarios.
+     * Allows the chaincode to propose an event on the transaction proposal response. When the transaction is included
+     * in a block and the block is successfully committed to the ledger, the block event (including transaction level
+     * chaincode events) will be delivered to the current client application event listeners that have been registered
+     * with the peer's event producer. Consult each SDK's documentation for details. Only a single chaincode event can
+     * be included in a transaction. If setEvent() is called multiple times only the last event will be included in the
+     * transaction. The event must originate from the outer-most invoked chaincode in chaincode-to-chaincode scenarios.
      * The marshaled ChaincodeEvent will be available in the transaction's ChaincodeAction.events field.
      *
-     * @param name    Name of event. Cannot be null or empty string.
+     * @param name Name of event. Cannot be null or empty string.
      * @param payload Optional event payload.
      */
     void setEvent(String name, byte[] payload);
 
     /**
      * Invoke another chaincode using the same transaction context.
-     * 

-     * Same as {@link #invokeChaincode(String, List, String)} using channelId to
-     * null
+     *
+     * 
Same as {@link #invokeChaincode(String, List, String)} using channelId to null
      *
      * @param chaincodeName Name of chaincode to be invoked.
-     * @param args          Arguments to pass on to the called chaincode.
+     * @param args Arguments to pass on to the called chaincode.
      * @return {@link Response} object returned by called chaincode
      */
     default Response invokeChaincode(final String chaincodeName, final List args) {
@@ -603,28 +528,29 @@ default Response invokeChaincode(final String chaincodeName, final List
 
     /**
      * Invoke another chaincode using the same transaction context.
-     * 

-     * This is a convenience version of
-     * {@link #invokeChaincode(String, List, String)}. The string args will be
+     *
+     * 
This is a convenience version of {@link #invokeChaincode(String, List, String)}. The string args will be
      * encoded into as UTF-8 bytes.
      *
      * @param chaincodeName Name of chaincode to be invoked.
-     * @param args          Arguments to pass on to the called chaincode.
-     * @param channel       If not specified, the caller's channel is assumed.
+     * @param args Arguments to pass on to the called chaincode.
+     * @param channel If not specified, the caller's channel is assumed.
      * @return {@link Response} object returned by called chaincode
      */
-    default Response invokeChaincodeWithStringArgs(final String chaincodeName, final List args, final String channel) {
-        return invokeChaincode(chaincodeName, args.stream().map(x -> x.getBytes(UTF_8)).collect(toList()), channel);
+    default Response invokeChaincodeWithStringArgs(
+            final String chaincodeName, final List args, final String channel) {
+        return invokeChaincode(
+                chaincodeName, args.stream().map(x -> x.getBytes(UTF_8)).collect(toList()), channel);
     }
 
     /**
      * Invoke another chaincode using the same transaction context.
-     * 

-     * This is a convenience version of {@link #invokeChaincode(String, List)}. The
-     * string args will be encoded into as UTF-8 bytes.
+     *
+     * 
This is a convenience version of {@link #invokeChaincode(String, List)}. The string args will be encoded into
+     * as UTF-8 bytes.
      *
      * @param chaincodeName Name of chaincode to be invoked.
-     * @param args          Arguments to pass on to the called chaincode.
+     * @param args Arguments to pass on to the called chaincode.
      * @return {@link Response} object returned by called chaincode
      */
     default Response invokeChaincodeWithStringArgs(final String chaincodeName, final List args) {
@@ -633,12 +559,12 @@ default Response invokeChaincodeWithStringArgs(final String chaincodeName, final
 
     /**
      * Invoke another chaincode using the same transaction context.
-     * 

-     * This is a convenience version of {@link #invokeChaincode(String, List)}. The
-     * string args will be encoded into as UTF-8 bytes.
+     *
+     * 
This is a convenience version of {@link #invokeChaincode(String, List)}. The string args will be encoded into
+     * as UTF-8 bytes.
      *
      * @param chaincodeName Name of chaincode to be invoked.
-     * @param args          Arguments to pass on to the called chaincode.
+     * @param args Arguments to pass on to the called chaincode.
      * @return {@link Response} object returned by called chaincode
      */
     default Response invokeChaincodeWithStringArgs(final String chaincodeName, final String... args) {
@@ -646,10 +572,9 @@ default Response invokeChaincodeWithStringArgs(final String chaincodeName, final
     }
 
     /**
-     * Returns the byte array value specified by the key and decoded as a UTF-8
-     * encoded string, from the ledger.
-     * 

-     * This is a convenience version of {@link #getState(String)}
+     * Returns the byte array value specified by the key and decoded as a UTF-8 encoded string, from the ledger.
+     *
+     * 
This is a convenience version of {@link #getState(String)}
      *
      * @param key name of the value
      * @return value the value read from the ledger
@@ -659,24 +584,22 @@ default String getStringState(final String key) {
     }
 
     /**
-     * Writes the specified value and key into the sidedb collection value converted
-     * to byte array.
+     * Writes the specified value and key into the sidedb collection value converted to byte array.
      *
      * @param collection collection name
-     * @param key        name of the value
-     * @param value      the value to write to the ledger
+     * @param key name of the value
+     * @param value the value to write to the ledger
      */
-
     default void putPrivateData(final String collection, final String key, final String value) {
         putPrivateData(collection, key, value.getBytes(UTF_8));
     }
 
     /**
-     * Returns the byte array value specified by the key and decoded as a UTF-8
-     * encoded string, from the sidedb collection.
+     * Returns the byte array value specified by the key and decoded as a UTF-8 encoded string, from the sidedb
+     * collection.
      *
      * @param collection collection name
-     * @param key        name of the value
+     * @param key name of the value
      * @return value the value read from the ledger
      */
     default String getPrivateDataUTF8(final String collection, final String key) {
@@ -686,7 +609,7 @@ default String getPrivateDataUTF8(final String collection, final String key) {
     /**
      * Writes the specified value and key into the ledger.
      *
-     * @param key   name of the value
+     * @param key name of the value
      * @param value the value to write to the ledger
      */
     default void putStringState(final String key, final String value) {
@@ -694,8 +617,8 @@ default void putStringState(final String key, final String value) {
     }
 
     /**
-     * Returns the CHAINCODE type event that will be posted to interested clients
-     * when the chaincode's result is committed to the ledger.
+     * Returns the CHAINCODE type event that will be posted to interested clients when the chaincode's result is
+     * committed to the ledger.
      *
      * @return the chaincode event or null
      */
@@ -704,8 +627,7 @@ default void putStringState(final String key, final String value) {
     /**
      * Returns the signed transaction proposal currently being executed.
      *
-     * @return null if the current transaction is an internal call to a system
-     *         chaincode.
+     * @return null if the current transaction is an internal call to a system chaincode.
      */
     SignedProposal getSignedProposal();
 
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChatChaincodeWithPeer.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChatChaincodeWithPeer.java
index 88bf0361..f53d0ad1 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChatChaincodeWithPeer.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChatChaincodeWithPeer.java
@@ -6,13 +6,12 @@
 package org.hyperledger.fabric.shim;
 
 import io.grpc.stub.StreamObserver;
+import java.io.IOException;
+import java.util.logging.Logger;
 import org.hyperledger.fabric.Logging;
 import org.hyperledger.fabric.protos.peer.ChaincodeGrpc;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 
-import java.io.IOException;
-import java.util.logging.Logger;
-
 public class ChatChaincodeWithPeer extends ChaincodeGrpc.ChaincodeImplBase {
     private static Logger logger = Logger.getLogger(ChatChaincodeWithPeer.class.getName());
 
@@ -28,8 +27,8 @@ public class ChatChaincodeWithPeer extends ChaincodeGrpc.ChaincodeImplBase {
     }
 
     /**
-     * Chaincode as a server - peer establishes a connection to the chaincode as a client
-     * Currently only supports a stream connection.
+     * Chaincode as a server - peer establishes a connection to the chaincode as a client Currently only supports a
+     * stream connection.
      *
      * @param responseObserver
      * @return
@@ -43,7 +42,8 @@ public StreamObserver connect(final StreamObserver "catch exception while chaincodeBase.connectToPeer(responseObserver)." + Logging.formatError(e));
+            logger.severe(() ->
+                    "catch exception while chaincodeBase.connectToPeer(responseObserver)." + Logging.formatError(e));
             return null;
         }
     }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/GrpcServer.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/GrpcServer.java
index aa10efc3..9460dd22 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/GrpcServer.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/GrpcServer.java
@@ -8,9 +8,7 @@
 
 import java.io.IOException;
 
-/**
- * Common interface for grpc server.
- */
+/** Common interface for grpc server. */
 public interface GrpcServer {
 
     /**
@@ -20,9 +18,7 @@ public interface GrpcServer {
      */
     void start() throws IOException;
 
-    /**
-     * shutdown now grpc server.
-     */
+    /** shutdown now grpc server. */
     void stop();
 
     /**
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/NettyChaincodeServer.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/NettyChaincodeServer.java
index a7073d78..df594ed2 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/NettyChaincodeServer.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/NettyChaincodeServer.java
@@ -10,9 +10,7 @@
 
 public class NettyChaincodeServer implements ChaincodeServer {
 
-    /**
-     * Server.
-     */
+    /** Server. */
     private final GrpcServer grpcServer;
 
     /**
@@ -22,7 +20,9 @@ public class NettyChaincodeServer implements ChaincodeServer {
      * @param chaincodeServerProperties - setting for grpc server
      * @throws IOException
      */
-    public NettyChaincodeServer(final ChaincodeBase chaincodeBase, final ChaincodeServerProperties chaincodeServerProperties) throws IOException {
+    public NettyChaincodeServer(
+            final ChaincodeBase chaincodeBase, final ChaincodeServerProperties chaincodeServerProperties)
+            throws IOException {
         // create listener and grpc server
         grpcServer = new NettyGrpcServer(chaincodeBase, chaincodeServerProperties);
     }
@@ -30,7 +30,7 @@ public NettyChaincodeServer(final ChaincodeBase chaincodeBase, final ChaincodeSe
     /**
      * run external chaincode server.
      *
-     * @throws IOException          problem while start grpc server
+     * @throws IOException problem while start grpc server
      * @throws InterruptedException thrown when block and awaiting shutdown gprc server
      */
     public void start() throws IOException, InterruptedException {
@@ -38,9 +38,7 @@ public void start() throws IOException, InterruptedException {
         grpcServer.blockUntilShutdown();
     }
 
-    /**
-     * shutdown now grpc server.
-     */
+    /** shutdown now grpc server. */
     public void stop() {
         grpcServer.stop();
     }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/NettyGrpcServer.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/NettyGrpcServer.java
index 4d6e9c33..bb142337 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/NettyGrpcServer.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/NettyGrpcServer.java
@@ -6,23 +6,19 @@
 
 package org.hyperledger.fabric.shim;
 
-
 import io.grpc.Server;
 import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
 import io.grpc.netty.shaded.io.netty.handler.ssl.ApplicationProtocolConfig;
 import io.grpc.netty.shaded.io.netty.handler.ssl.ApplicationProtocolNames;
 import io.grpc.netty.shaded.io.netty.handler.ssl.ClientAuth;
 import io.grpc.netty.shaded.io.netty.handler.ssl.SslContextBuilder;
-import java.util.logging.Logger;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
 
-/**
- * implementation grpc server with NettyGrpcServer.
- */
+/** implementation grpc server with NettyGrpcServer. */
 public final class NettyGrpcServer implements GrpcServer {
 
     private static final Logger LOGGER = Logger.getLogger(NettyGrpcServer.class.getName());
@@ -32,11 +28,12 @@ public final class NettyGrpcServer implements GrpcServer {
     /**
      * init netty grpc server.
      *
-     * @param chaincodeBase             - chaincode implementation (invoke, init)
+     * @param chaincodeBase - chaincode implementation (invoke, init)
      * @param chaincodeServerProperties - setting for grpc server
      * @throws IOException
      */
-    public NettyGrpcServer(final ChaincodeBase chaincodeBase, final ChaincodeServerProperties chaincodeServerProperties) throws IOException {
+    public NettyGrpcServer(final ChaincodeBase chaincodeBase, final ChaincodeServerProperties chaincodeServerProperties)
+            throws IOException {
         if (chaincodeBase == null) {
             throw new IllegalArgumentException("chaincode must be specified");
         }
@@ -45,7 +42,8 @@ public NettyGrpcServer(final ChaincodeBase chaincodeBase, final ChaincodeServerP
         }
         chaincodeServerProperties.validate();
 
-        final NettyServerBuilder serverBuilder = NettyServerBuilder.forAddress(chaincodeServerProperties.getServerAddress())
+        final NettyServerBuilder serverBuilder = NettyServerBuilder.forAddress(
+                        chaincodeServerProperties.getServerAddress())
                 .addService(new ChatChaincodeWithPeer(chaincodeBase))
                 .keepAliveTime(chaincodeServerProperties.getKeepAliveTimeMinutes(), TimeUnit.MINUTES)
                 .keepAliveTimeout(chaincodeServerProperties.getKeepAliveTimeoutSeconds(), TimeUnit.SECONDS)
@@ -56,14 +54,18 @@ public NettyGrpcServer(final ChaincodeBase chaincodeBase, final ChaincodeServerP
                 .maxInboundMessageSize(chaincodeServerProperties.getMaxInboundMessageSize());
 
         if (chaincodeServerProperties.isTlsEnabled()) {
-            final File keyCertChainFile = Paths.get(chaincodeServerProperties.getKeyCertChainFile()).toFile();
-            final File keyFile = Paths.get(chaincodeServerProperties.getKeyFile()).toFile();
+            final File keyCertChainFile =
+                    Paths.get(chaincodeServerProperties.getKeyCertChainFile()).toFile();
+            final File keyFile =
+                    Paths.get(chaincodeServerProperties.getKeyFile()).toFile();
 
             SslContextBuilder sslContextBuilder;
-            if (chaincodeServerProperties.getKeyPassword() == null || chaincodeServerProperties.getKeyPassword().isEmpty()) {
+            if (chaincodeServerProperties.getKeyPassword() == null
+                    || chaincodeServerProperties.getKeyPassword().isEmpty()) {
                 sslContextBuilder = SslContextBuilder.forServer(keyCertChainFile, keyFile);
             } else {
-                sslContextBuilder = SslContextBuilder.forServer(keyCertChainFile, keyFile, chaincodeServerProperties.getKeyPassword());
+                sslContextBuilder = SslContextBuilder.forServer(
+                        keyCertChainFile, keyFile, chaincodeServerProperties.getKeyPassword());
             }
 
             ApplicationProtocolConfig apn = new ApplicationProtocolConfig(
@@ -74,7 +76,8 @@ public NettyGrpcServer(final ChaincodeBase chaincodeBase, final ChaincodeServerP
             sslContextBuilder.applicationProtocolConfig(apn);
 
             if (chaincodeServerProperties.getTrustCertCollectionFile() != null) {
-                final File trustCertCollectionFile = Paths.get(chaincodeServerProperties.getTrustCertCollectionFile()).toFile();
+                final File trustCertCollectionFile = Paths.get(chaincodeServerProperties.getTrustCertCollectionFile())
+                        .toFile();
                 sslContextBuilder.clientAuth(ClientAuth.REQUIRE);
                 sslContextBuilder.trustManager(trustCertCollectionFile);
             }
@@ -83,7 +86,8 @@ public NettyGrpcServer(final ChaincodeBase chaincodeBase, final ChaincodeServerP
         }
 
         LOGGER.info("<<<<<<<<<<<<>>>>>>>>>>>:\n");
-        LOGGER.info("ServerAddress:" + chaincodeServerProperties.getServerAddress().toString());
+        LOGGER.info(
+                "ServerAddress:" + chaincodeServerProperties.getServerAddress().toString());
         LOGGER.info("MaxInboundMetadataSize:" + chaincodeServerProperties.getMaxInboundMetadataSize());
         LOGGER.info("MaxInboundMessageSize:" + chaincodeServerProperties.getMaxInboundMessageSize());
         LOGGER.info("MaxConnectionAgeSeconds:" + chaincodeServerProperties.getMaxConnectionAgeSeconds());
@@ -107,14 +111,12 @@ public NettyGrpcServer(final ChaincodeBase chaincodeBase, final ChaincodeServerP
      */
     public void start() throws IOException {
         LOGGER.info("start grpc server");
-        Runtime.getRuntime()
-                .addShutdownHook(
-                        new Thread(() -> {
-                            // Use stderr here since the logger may have been reset by its JVM shutdown hook.
-                            System.err.println("*** shutting down gRPC server since JVM is shutting down");
-                            NettyGrpcServer.this.stop();
-                            System.err.println("*** server shut down");
-                        }));
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            // Use stderr here since the logger may have been reset by its JVM shutdown hook.
+            System.err.println("*** shutting down gRPC server since JVM is shutting down");
+            NettyGrpcServer.this.stop();
+            System.err.println("*** server shut down");
+        }));
         server.start();
     }
 
@@ -128,9 +130,7 @@ public void blockUntilShutdown() throws InterruptedException {
         server.awaitTermination();
     }
 
-    /**
-     * shutdown now grpc server.
-     */
+    /** shutdown now grpc server. */
     public void stop() {
         LOGGER.info("shutdown now grpc server.");
         server.shutdownNow();
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ResponseUtils.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ResponseUtils.java
index c46e1a78..bd6ee06e 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ResponseUtils.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ResponseUtils.java
@@ -14,8 +14,7 @@ public final class ResponseUtils {
 
     private static Logger logger = Logger.getLogger(ResponseUtils.class.getName());
 
-    private ResponseUtils() {
-    }
+    private ResponseUtils() {}
 
     /**
      * @param message
@@ -26,9 +25,7 @@ public static Chaincode.Response newSuccessResponse(final String message, final
         return new Chaincode.Response(SUCCESS, message, payload);
     }
 
-    /**
-     * @return Chaincode.Response
-     */
+    /** @return Chaincode.Response */
     public static Chaincode.Response newSuccessResponse() {
         return newSuccessResponse(null, null);
     }
@@ -58,9 +55,7 @@ public static Chaincode.Response newErrorResponse(final String message, final by
         return new Chaincode.Response(INTERNAL_SERVER_ERROR, message, payload);
     }
 
-    /**
-     * @return Chaincode.Response
-     */
+    /** @return Chaincode.Response */
     public static Chaincode.Response newErrorResponse() {
         return newErrorResponse(null, null);
     }
@@ -100,7 +95,5 @@ public static Chaincode.Response newErrorResponse(final Throwable throwable) {
             message = "Unexpected error";
             return ResponseUtils.newErrorResponse(message, payload);
         }
-
-
     }
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/StateBasedEndorsement.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/StateBasedEndorsement.java
index a7b25020..c390ef90 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/StateBasedEndorsement.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/StateBasedEndorsement.java
@@ -10,10 +10,9 @@
 import java.util.Map;
 
 /**
- * StateBasedEndorsement provides a set of convenience methods to create and
- * modify a state-based endorsement policy. Endorsement policies created by this
- * convenience layer will always be a logical AND of "ORG.peer" principals for
- * one or more ORGs specified by the caller.
+ * StateBasedEndorsement provides a set of convenience methods to create and modify a state-based endorsement policy.
+ * Endorsement policies created by this convenience layer will always be a logical AND of "ORG.peer" principals for one
+ * or more ORGs specified by the caller.
  */
 public interface StateBasedEndorsement {
     /**
@@ -24,20 +23,18 @@ public interface StateBasedEndorsement {
     byte[] policy();
 
     /**
-     * Adds the specified orgs to the list of orgs that are required to endorse. All
-     * orgs MSP role types will be set to the role that is specified in the first
-     * parameter. Among other aspects the desired role depends on the channel's
-     * configuration: if it supports node OUs, it is likely going to be the PEER
-     * role, while the MEMBER role is the suited one if it does not.
+     * Adds the specified orgs to the list of orgs that are required to endorse. All orgs MSP role types will be set to
+     * the role that is specified in the first parameter. Among other aspects the desired role depends on the channel's
+     * configuration: if it supports node OUs, it is likely going to be the PEER role, while the MEMBER role is the
+     * suited one if it does not.
      *
-     * @param roleType      the MSP role type
+     * @param roleType the MSP role type
      * @param organizations the list of organizations
      */
     void addOrgs(RoleType roleType, String... organizations);
 
     /**
-     * deletes the specified channel orgs from the existing key-level endorsement
-     * policy for this KVS key.
+     * deletes the specified channel orgs from the existing key-level endorsement policy for this KVS key.
      *
      * @param organizations the list of organizations
      */
@@ -50,17 +47,11 @@ public interface StateBasedEndorsement {
      */
     List listOrgs();
 
-    /**
-     * RoleType of an endorsement policy's identity.
-     */
+    /** RoleType of an endorsement policy's identity. */
     enum RoleType {
-        /**
-         * RoleTypeMember identifies an org's member identity.
-         */
+        /** RoleTypeMember identifies an org's member identity. */
         RoleTypeMember("MEMBER"),
-        /**
-         * RoleTypePeer identifies an org's peer identity.
-         */
+        /** RoleTypePeer identifies an org's peer identity. */
         RoleTypePeer("PEER");
 
         private final String val;
@@ -69,10 +60,7 @@ enum RoleType {
             this.val = val;
         }
 
-        /**
-         *
-         * @return String value
-         */
+        /** @return String value */
         public String getVal() {
             return val;
         }
@@ -86,7 +74,6 @@ public String getVal() {
         }
 
         /**
-         *
          * @param val
          * @return RoleType
          */
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementFactory.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementFactory.java
index da1db8ca..f93fc6ce 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementFactory.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementFactory.java
@@ -7,16 +7,11 @@
 
 import org.hyperledger.fabric.shim.ext.sbe.StateBasedEndorsement;
 
-/**
- * Factory for {@link StateBasedEndorsement} objects.
- */
+/** Factory for {@link StateBasedEndorsement} objects. */
 public class StateBasedEndorsementFactory {
     private static StateBasedEndorsementFactory instance;
 
-    /**
-     *
-     * @return Endorsement Factory
-     */
+    /** @return Endorsement Factory */
     public static synchronized StateBasedEndorsementFactory getInstance() {
         if (instance == null) {
             instance = new StateBasedEndorsementFactory();
@@ -25,8 +20,8 @@ public static synchronized StateBasedEndorsementFactory getInstance() {
     }
 
     /**
-     * Constructs a state-based endorsement policy from a given serialized EP byte
-     * array. If the byte array is empty, a new EP is created.
+     * Constructs a state-based endorsement policy from a given serialized EP byte array. If the byte array is empty, a
+     * new EP is created.
      *
      * @param ep serialized endorsement policy
      * @return New StateBasedEndorsement instance
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementImpl.java
index 6dbdbd26..68a67369 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementImpl.java
@@ -5,12 +5,12 @@
  */
 package org.hyperledger.fabric.shim.ext.sbe.impl;
 
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hyperledger.fabric.protos.common.MSPPrincipal;
@@ -21,11 +21,7 @@
 import org.hyperledger.fabric.protos.common.SignaturePolicyEnvelope;
 import org.hyperledger.fabric.shim.ext.sbe.StateBasedEndorsement;
 
-import com.google.protobuf.InvalidProtocolBufferException;
-
-/**
- * Implements {@link StateBasedEndorsement}.
- */
+/** Implements {@link StateBasedEndorsement}. */
 public final class StateBasedEndorsementImpl implements StateBasedEndorsement {
     private static Log logger = LogFactory.getLog(StateBasedEndorsementImpl.class);
 
@@ -44,7 +40,6 @@ public final class StateBasedEndorsementImpl implements StateBasedEndorsement {
         } catch (final InvalidProtocolBufferException e) {
             throw new IllegalArgumentException("error unmarshalling endorsement policy bytes", e);
         }
-
     }
 
     @Override
@@ -81,7 +76,9 @@ public List listOrgs() {
     }
 
     private void setMSPIDsFromSP(final SignaturePolicyEnvelope spe) {
-        spe.getIdentitiesList().stream().filter(identity -> Classification.ROLE.equals(identity.getPrincipalClassification())).forEach(this::addOrg);
+        spe.getIdentitiesList().stream()
+                .filter(identity -> Classification.ROLE.equals(identity.getPrincipalClassification()))
+                .forEach(this::addOrg);
     }
 
     private void addOrg(final MSPPrincipal identity) {
@@ -102,15 +99,23 @@ private SignaturePolicyEnvelope policyFromMSPIDs() {
         final List sigpolicy = new ArrayList<>();
         for (int i = 0; i < mspids.size(); i++) {
             final String mspid = mspids.get(i);
-            principals.add(MSPPrincipal.newBuilder().setPrincipalClassification(Classification.ROLE)
-                    .setPrincipal(MSPRole.newBuilder().setMspIdentifier(mspid).setRole(orgs.get(mspid)).build().toByteString()).build());
+            principals.add(MSPPrincipal.newBuilder()
+                    .setPrincipalClassification(Classification.ROLE)
+                    .setPrincipal(MSPRole.newBuilder()
+                            .setMspIdentifier(mspid)
+                            .setRole(orgs.get(mspid))
+                            .build()
+                            .toByteString())
+                    .build());
 
             sigpolicy.add(StateBasedEndorsementUtils.signedBy(i));
         }
 
         // create the policy: it requires exactly 1 signature from all of the principals
-        return SignaturePolicyEnvelope.newBuilder().setVersion(0).setRule(StateBasedEndorsementUtils.nOutOf(mspids.size(), sigpolicy))
-                .addAllIdentities(principals).build();
+        return SignaturePolicyEnvelope.newBuilder()
+                .setVersion(0)
+                .setRule(StateBasedEndorsementUtils.nOutOf(mspids.size(), sigpolicy))
+                .addAllIdentities(principals)
+                .build();
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementUtils.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementUtils.java
index 4234a70c..845056bc 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementUtils.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementUtils.java
@@ -7,7 +7,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-
 import org.hyperledger.fabric.protos.common.MSPPrincipal;
 import org.hyperledger.fabric.protos.common.MSPPrincipal.Classification;
 import org.hyperledger.fabric.protos.common.MSPRole;
@@ -16,15 +15,10 @@
 import org.hyperledger.fabric.protos.common.SignaturePolicy.NOutOf;
 import org.hyperledger.fabric.protos.common.SignaturePolicyEnvelope;
 
-/**
- * Utility to create {@link SignaturePolicy} and
- * {@link SignaturePolicyEnvelope}.
- */
+/** Utility to create {@link SignaturePolicy} and {@link SignaturePolicyEnvelope}. */
 public final class StateBasedEndorsementUtils {
 
-    private StateBasedEndorsementUtils() {
-
-    }
+    private StateBasedEndorsementUtils() {}
 
     /**
      * Creates a SignaturePolicy requiring a given signer's signature.
@@ -39,20 +33,21 @@ static SignaturePolicy signedBy(final int index) {
     /**
      * Create a policy.
      *
-     * Creates a policy which requires N out of the slice of policies to evaluate to
-     * true
+     * 
Creates a policy which requires N out of the slice of policies to evaluate to true
      *
      * @param n
      * @param policies
      * @return SignaturePolicy
      */
     static SignaturePolicy nOutOf(final int n, final List policies) {
-        return SignaturePolicy.newBuilder().setNOutOf(NOutOf.newBuilder().setN(n).addAllRules(policies).build()).build();
+        return SignaturePolicy.newBuilder()
+                .setNOutOf(NOutOf.newBuilder().setN(n).addAllRules(policies).build())
+                .build();
     }
 
     /**
-     * Creates a {@link SignaturePolicyEnvelope} requiring 1 signature from any
-     * fabric entity, having the passed role, of the specified MSP.
+     * Creates a {@link SignaturePolicyEnvelope} requiring 1 signature from any fabric entity, having the passed role,
+     * of the specified MSP.
      *
      * @param mspId
      * @param role
@@ -60,13 +55,21 @@ static SignaturePolicy nOutOf(final int n, final List policies)
      */
     static SignaturePolicyEnvelope signedByFabricEntity(final String mspId, final MSPRoleType role) {
         // specify the principal: it's a member of the msp we just found
-        final MSPPrincipal principal = MSPPrincipal.newBuilder().setPrincipalClassification(Classification.ROLE)
-                .setPrincipal(MSPRole.newBuilder().setMspIdentifier(mspId).setRole(role).build().toByteString()).build();
+        final MSPPrincipal principal = MSPPrincipal.newBuilder()
+                .setPrincipalClassification(Classification.ROLE)
+                .setPrincipal(MSPRole.newBuilder()
+                        .setMspIdentifier(mspId)
+                        .setRole(role)
+                        .build()
+                        .toByteString())
+                .build();
 
         // create the policy: it requires exactly 1 signature from the first (and only)
         // principal
-        return SignaturePolicyEnvelope.newBuilder().setVersion(0).setRule(nOutOf(1, Arrays.asList(signedBy(0)))).addIdentities(principal).build();
-
+        return SignaturePolicyEnvelope.newBuilder()
+                .setVersion(0)
+                .setRule(nOutOf(1, Arrays.asList(signedBy(0))))
+                .addIdentities(principal)
+                .build();
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/package-info.java
index f4f3bb51..329c3a35 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/impl/package-info.java
@@ -1,6 +1,6 @@
-/*
- * Copyright 2023 IBM All Rights Reserved.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.fabric.shim.ext.sbe.impl;
+/*
+ * Copyright 2023 IBM All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.fabric.shim.ext.sbe.impl;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/package-info.java
index 50735e07..15c86c68 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ext/sbe/package-info.java
@@ -4,7 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * Provides an interface for creating and modifying state-based endorsement policies.
- */
+/** Provides an interface for creating and modifying state-based endorsement policies. */
 package org.hyperledger.fabric.shim.ext.sbe;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/ChaincodeInvocationTask.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/ChaincodeInvocationTask.java
index 8cafebdb..b2c3c916 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/ChaincodeInvocationTask.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/ChaincodeInvocationTask.java
@@ -9,27 +9,22 @@
 import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.ERROR;
 import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.RESPONSE;
 
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.Callable;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
-
-import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.api.trace.StatusCode;
 import org.hyperledger.fabric.Logging;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type;
 import org.hyperledger.fabric.shim.Chaincode;
 import org.hyperledger.fabric.shim.ChaincodeStub;
-
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
 import org.hyperledger.fabric.traces.Traces;
 
-/**
- * A 'Callable' implementation the has the job of invoking the chaincode, and
- * matching the response and requests.
- */
+/** A 'Callable' implementation the has the job of invoking the chaincode, and matching the response and requests. */
 public class ChaincodeInvocationTask implements Callable {
 
     private static Logger logger = Logger.getLogger(ChaincodeInvocationTask.class.getName());
@@ -51,17 +46,16 @@ public class ChaincodeInvocationTask implements Callable {
     private final Chaincode chaincode;
 
     /**
-     *
-     * @param message         The incoming message that has triggered this task into
-     *                        execution
-     * @param type            Is this init or invoke? (v2 Fabric deprecates init)
-     * @param outgoingMessage The Consumer functional interface to send any requests
-     *                        for ledger state
-     * @param chaincode       A instance of the end users chaincode
-     *
+     * @param message The incoming message that has triggered this task into execution
+     * @param type Is this init or invoke? (v2 Fabric deprecates init)
+     * @param outgoingMessage The Consumer functional interface to send any requests for ledger state
+     * @param chaincode A instance of the end users chaincode
      */
-    public ChaincodeInvocationTask(final ChaincodeMessage message, final Type type,
-            final Consumer outgoingMessage, final Chaincode chaincode) {
+    public ChaincodeInvocationTask(
+            final ChaincodeMessage message,
+            final Type type,
+            final Consumer outgoingMessage,
+            final Chaincode chaincode) {
 
         this.key = message.getChannelId() + message.getTxid();
         this.type = type;
@@ -71,9 +65,7 @@ public ChaincodeInvocationTask(final ChaincodeMessage message, final Type type,
         this.message = message;
     }
 
-    /**
-     * Main method to power the invocation of the chaincode.
-     */
+    /** Main method to power the invocation of the chaincode. */
     @Override
     public ChaincodeMessage call() {
         ChaincodeMessage finalResponseMessage;
@@ -95,7 +87,6 @@ public ChaincodeMessage call() {
                 // result is what will be sent to the peer as a response to this invocation
                 final Chaincode.Response result;
 
-
                 perfLogger.fine(() -> "> task:invoke TX::" + this.txId);
 
                 // Call chaincode's invoke
@@ -110,24 +101,27 @@ public ChaincodeMessage call() {
 
                 if (result.getStatus().getCode() >= Chaincode.Response.Status.INTERNAL_SERVER_ERROR.getCode()) {
                     // Send ERROR with entire result.Message as payload
-                    logger.severe(() -> String.format("[%-8.8s] Invoke failed with error code %d. Sending %s",
+                    logger.severe(() -> String.format(
+                            "[%-8.8s] Invoke failed with error code %d. Sending %s",
                             message.getTxid(), result.getStatus().getCode(), ERROR));
-                    finalResponseMessage = ChaincodeMessageFactory.newCompletedEventMessage(message.getChannelId(),
-                            message.getTxid(), result, stub.getEvent());
+                    finalResponseMessage = ChaincodeMessageFactory.newCompletedEventMessage(
+                            message.getChannelId(), message.getTxid(), result, stub.getEvent());
                     if (span != null) {
                         span.setStatus(StatusCode.ERROR, result.getMessage());
                     }
                 } else {
                     // Send COMPLETED with entire result as payload
-                    logger.fine(() -> String.format("[%-8.8s] Invoke succeeded. Sending %s", message.getTxid(), COMPLETED));
-                    finalResponseMessage = ChaincodeMessageFactory.newCompletedEventMessage(message.getChannelId(),
-                            message.getTxid(), result, stub.getEvent());
+                    logger.fine(
+                            () -> String.format("[%-8.8s] Invoke succeeded. Sending %s", message.getTxid(), COMPLETED));
+                    finalResponseMessage = ChaincodeMessageFactory.newCompletedEventMessage(
+                            message.getChannelId(), message.getTxid(), result, stub.getEvent());
                 }
 
             } catch (InvalidProtocolBufferException | RuntimeException e) {
-                logger.severe(() -> String.format("[%-8.8s] Invoke failed. Sending %s: %s", message.getTxid(), ERROR, e));
-                finalResponseMessage = ChaincodeMessageFactory.newErrorEventMessage(message.getChannelId(),
-                        message.getTxid(), e);
+                logger.severe(
+                        () -> String.format("[%-8.8s] Invoke failed. Sending %s: %s", message.getTxid(), ERROR, e));
+                finalResponseMessage =
+                        ChaincodeMessageFactory.newErrorEventMessage(message.getChannelId(), message.getTxid(), e);
                 if (span != null) {
                     span.setStatus(StatusCode.ERROR, e.getMessage());
                 }
@@ -165,11 +159,11 @@ public boolean equals(final ChaincodeInvocationTask task) {
     }
 
     /**
-     * Posts the message that the peer has responded with to this task's request
-     * Uses an 'ArrayBlockingQueue'.  This lets the producer post messages without waiting
-     * for the consumer. And the consumer can block until a message is posted.
+     * Posts the message that the peer has responded with to this task's request Uses an 'ArrayBlockingQueue'. This lets
+     * the producer post messages without waiting for the consumer. And the consumer can block until a message is
+     * posted.
      *
-     * In this case the data is only passed to the executing tasks.
+     * 
In this case the data is only passed to the executing tasks.
      *
      * @param msg Chaincode message to pass pack
      * @throws InterruptedException should something really really go wrong
@@ -182,17 +176,16 @@ public void postMessage(final ChaincodeMessage msg) throws InterruptedException
     /**
      * Send the chaincode message back to the peer.
      *
-     * Implementation of the Functional interface 'InvokeChaincodeSupport'
+     * 
Implementation of the Functional interface 'InvokeChaincodeSupport'
      *
-     * It will send the message, via the outgoingMessageConsumer, and then block on
-     * the 'Exchanger' to wait for the response to come.
+     * 
It will send the message, via the outgoingMessageConsumer, and then block on the 'Exchanger' to wait for the
+     * response to come.
      *
-     * This Exchange is an atomic operation between the thread that is running this
-     * task, and the thread that is handling the communication from the peer.
+     * 
This Exchange is an atomic operation between the thread that is running this task, and the thread that is
+     * handling the communication from the peer.
      *
      * @param message The chaincode message from the peer
      * @return ByteString to be parsed by the caller
-     *
      */
     protected ByteString invoke(final ChaincodeMessage message) {
 
@@ -220,12 +213,12 @@ protected ByteString invoke(final ChaincodeMessage message) {
                 logger.severe(() -> String.format("[%-8.8s] Unsuccessful response received.", txId));
                 throw new RuntimeException(String.format("[%-8.8s]Unsuccessful response received.", txId));
             default:
-                logger.severe(() -> String.format("[%-8.8s] Unexpected %s response received. Expected %s or %s.", txId,
-                        response.getType(), RESPONSE, ERROR));
-                throw new RuntimeException(String.format("[%-8.8s] Unexpected %s response received. Expected %s or %s.",
+                logger.severe(() -> String.format(
+                        "[%-8.8s] Unexpected %s response received. Expected %s or %s.",
+                        txId, response.getType(), RESPONSE, ERROR));
+                throw new RuntimeException(String.format(
+                        "[%-8.8s] Unexpected %s response received. Expected %s or %s.",
                         txId, response.getType(), RESPONSE, ERROR));
         }
-
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/ChaincodeMessageFactory.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/ChaincodeMessageFactory.java
index 831e2277..651bc81a 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/ChaincodeMessageFactory.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/ChaincodeMessageFactory.java
@@ -16,11 +16,11 @@
 import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.PUT_STATE_METADATA;
 import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.REGISTER;
 
+import com.google.protobuf.ByteString;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-
-import org.hyperledger.fabric.protos.peer.ChaincodeID;
 import org.hyperledger.fabric.protos.peer.ChaincodeEvent;
+import org.hyperledger.fabric.protos.peer.ChaincodeID;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type;
 import org.hyperledger.fabric.protos.peer.DelState;
@@ -28,82 +28,170 @@
 import org.hyperledger.fabric.protos.peer.GetStateMetadata;
 import org.hyperledger.fabric.protos.peer.PutState;
 import org.hyperledger.fabric.protos.peer.PutStateMetadata;
-import org.hyperledger.fabric.protos.peer.StateMetadata;
 import org.hyperledger.fabric.protos.peer.Response;
 import org.hyperledger.fabric.protos.peer.Response.Builder;
+import org.hyperledger.fabric.protos.peer.StateMetadata;
 import org.hyperledger.fabric.shim.Chaincode;
 
-import com.google.protobuf.ByteString;
-
 public final class ChaincodeMessageFactory {
 
-    private ChaincodeMessageFactory() {
-    }
-
-    protected static ChaincodeMessage newGetPrivateDataHashEventMessage(final String channelId, final String txId, final String collection, final String key) {
-        return newEventMessage(GET_PRIVATE_DATA_HASH, channelId, txId, GetState.newBuilder().setCollection(collection).setKey(key).build().toByteString());
-    }
-
-    protected static ChaincodeMessage newGetStateEventMessage(final String channelId, final String txId, final String collection, final String key) {
-        return newEventMessage(GET_STATE, channelId, txId, GetState.newBuilder().setCollection(collection).setKey(key).build().toByteString());
-    }
-
-    protected static ChaincodeMessage newGetStateMetadataEventMessage(final String channelId, final String txId, final String collection, final String key) {
-        return newEventMessage(GET_STATE_METADATA, channelId, txId, GetStateMetadata.newBuilder().setCollection(collection).setKey(key).build().toByteString());
-    }
-
-    protected static ChaincodeMessage newPutStateEventMessage(final String channelId, final String txId, final String collection, final String key,
+    private ChaincodeMessageFactory() {}
+
+    protected static ChaincodeMessage newGetPrivateDataHashEventMessage(
+            final String channelId, final String txId, final String collection, final String key) {
+        return newEventMessage(
+                GET_PRIVATE_DATA_HASH,
+                channelId,
+                txId,
+                GetState.newBuilder()
+                        .setCollection(collection)
+                        .setKey(key)
+                        .build()
+                        .toByteString());
+    }
+
+    protected static ChaincodeMessage newGetStateEventMessage(
+            final String channelId, final String txId, final String collection, final String key) {
+        return newEventMessage(
+                GET_STATE,
+                channelId,
+                txId,
+                GetState.newBuilder()
+                        .setCollection(collection)
+                        .setKey(key)
+                        .build()
+                        .toByteString());
+    }
+
+    protected static ChaincodeMessage newGetStateMetadataEventMessage(
+            final String channelId, final String txId, final String collection, final String key) {
+        return newEventMessage(
+                GET_STATE_METADATA,
+                channelId,
+                txId,
+                GetStateMetadata.newBuilder()
+                        .setCollection(collection)
+                        .setKey(key)
+                        .build()
+                        .toByteString());
+    }
+
+    protected static ChaincodeMessage newPutStateEventMessage(
+            final String channelId,
+            final String txId,
+            final String collection,
+            final String key,
             final ByteString value) {
-        return newEventMessage(PUT_STATE, channelId, txId, PutState.newBuilder().setCollection(collection).setKey(key).setValue(value).build().toByteString());
-    }
-
-    protected static ChaincodeMessage newPutStateMetadataEventMessage(final String channelId, final String txId, final String collection, final String key,
-            final String metakey, final ByteString value) {
-        return newEventMessage(PUT_STATE_METADATA, channelId, txId, PutStateMetadata.newBuilder().setCollection(collection).setKey(key)
-                .setMetadata(StateMetadata.newBuilder().setMetakey(metakey).setValue(value).build()).build().toByteString());
-    }
-
-    protected static ChaincodeMessage newDeleteStateEventMessage(final String channelId, final String txId, final String collection, final String key) {
-        return newEventMessage(DEL_STATE, channelId, txId, DelState.newBuilder().setCollection(collection).setKey(key).build().toByteString());
-    }
-
-    protected static ChaincodeMessage newPurgeStateEventMessage(final String channelId, final String txId, final String collection, final String key) {
-        return newEventMessage(Type.PURGE_PRIVATE_DATA, channelId, txId, DelState.newBuilder().setCollection(collection).setKey(key).build().toByteString());
-    }
-
-    protected static ChaincodeMessage newErrorEventMessage(final String channelId, final String txId, final Throwable throwable) {
+        return newEventMessage(
+                PUT_STATE,
+                channelId,
+                txId,
+                PutState.newBuilder()
+                        .setCollection(collection)
+                        .setKey(key)
+                        .setValue(value)
+                        .build()
+                        .toByteString());
+    }
+
+    protected static ChaincodeMessage newPutStateMetadataEventMessage(
+            final String channelId,
+            final String txId,
+            final String collection,
+            final String key,
+            final String metakey,
+            final ByteString value) {
+        return newEventMessage(
+                PUT_STATE_METADATA,
+                channelId,
+                txId,
+                PutStateMetadata.newBuilder()
+                        .setCollection(collection)
+                        .setKey(key)
+                        .setMetadata(StateMetadata.newBuilder()
+                                .setMetakey(metakey)
+                                .setValue(value)
+                                .build())
+                        .build()
+                        .toByteString());
+    }
+
+    protected static ChaincodeMessage newDeleteStateEventMessage(
+            final String channelId, final String txId, final String collection, final String key) {
+        return newEventMessage(
+                DEL_STATE,
+                channelId,
+                txId,
+                DelState.newBuilder()
+                        .setCollection(collection)
+                        .setKey(key)
+                        .build()
+                        .toByteString());
+    }
+
+    protected static ChaincodeMessage newPurgeStateEventMessage(
+            final String channelId, final String txId, final String collection, final String key) {
+        return newEventMessage(
+                Type.PURGE_PRIVATE_DATA,
+                channelId,
+                txId,
+                DelState.newBuilder()
+                        .setCollection(collection)
+                        .setKey(key)
+                        .build()
+                        .toByteString());
+    }
+
+    protected static ChaincodeMessage newErrorEventMessage(
+            final String channelId, final String txId, final Throwable throwable) {
         return newErrorEventMessage(channelId, txId, printStackTrace(throwable));
     }
 
-    protected static ChaincodeMessage newErrorEventMessage(final String channelId, final String txId, final String message) {
+    protected static ChaincodeMessage newErrorEventMessage(
+            final String channelId, final String txId, final String message) {
         return newErrorEventMessage(channelId, txId, message, null);
     }
 
-    protected static ChaincodeMessage newErrorEventMessage(final String channelId, final String txId, final String message, final ChaincodeEvent event) {
+    protected static ChaincodeMessage newErrorEventMessage(
+            final String channelId, final String txId, final String message, final ChaincodeEvent event) {
         return newEventMessage(ERROR, channelId, txId, ByteString.copyFromUtf8(message), event);
     }
 
-    protected static ChaincodeMessage newCompletedEventMessage(final String channelId, final String txId, final Chaincode.Response response,
-            final ChaincodeEvent event) {
-        final ChaincodeMessage message = newEventMessage(COMPLETED, channelId, txId, toProtoResponse(response).toByteString(), event);
+    protected static ChaincodeMessage newCompletedEventMessage(
+            final String channelId, final String txId, final Chaincode.Response response, final ChaincodeEvent event) {
+        final ChaincodeMessage message = newEventMessage(
+                COMPLETED, channelId, txId, toProtoResponse(response).toByteString(), event);
         return message;
     }
 
-    protected static ChaincodeMessage newInvokeChaincodeMessage(final String channelId, final String txId, final ByteString payload) {
+    protected static ChaincodeMessage newInvokeChaincodeMessage(
+            final String channelId, final String txId, final ByteString payload) {
         return newEventMessage(INVOKE_CHAINCODE, channelId, txId, payload, null);
     }
 
     protected static ChaincodeMessage newRegisterChaincodeMessage(final ChaincodeID chaincodeId) {
-        return ChaincodeMessage.newBuilder().setType(REGISTER).setPayload(chaincodeId.toByteString()).build();
+        return ChaincodeMessage.newBuilder()
+                .setType(REGISTER)
+                .setPayload(chaincodeId.toByteString())
+                .build();
     }
 
-    protected static ChaincodeMessage newEventMessage(final Type type, final String channelId, final String txId, final ByteString payload) {
+    protected static ChaincodeMessage newEventMessage(
+            final Type type, final String channelId, final String txId, final ByteString payload) {
         return newEventMessage(type, channelId, txId, payload, null);
     }
 
-    protected static ChaincodeMessage newEventMessage(final Type type, final String channelId, final String txId, final ByteString payload,
+    protected static ChaincodeMessage newEventMessage(
+            final Type type,
+            final String channelId,
+            final String txId,
+            final ByteString payload,
             final ChaincodeEvent event) {
-        final ChaincodeMessage.Builder builder = ChaincodeMessage.newBuilder().setType(type).setChannelId(channelId).setTxid(txId).setPayload(payload);
+        final ChaincodeMessage.Builder builder = ChaincodeMessage.newBuilder()
+                .setType(type)
+                .setChannelId(channelId)
+                .setTxid(txId)
+                .setPayload(payload);
         if (event != null) {
             builder.setChaincodeEvent(event);
         }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/ChaincodeSupportClient.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/ChaincodeSupportClient.java
index 7216ad30..d3a6190d 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/ChaincodeSupportClient.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/ChaincodeSupportClient.java
@@ -5,21 +5,19 @@
  */
 package org.hyperledger.fabric.shim.impl;
 
+import io.grpc.ClientInterceptor;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.stub.StreamObserver;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
-
-import io.grpc.ClientInterceptor;
 import org.hyperledger.fabric.Logging;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.ChaincodeSupportGrpc;
 import org.hyperledger.fabric.protos.peer.ChaincodeSupportGrpc.ChaincodeSupportStub;
-
-import io.grpc.ManagedChannel;
-import io.grpc.ManagedChannelBuilder;
-import io.grpc.stub.StreamObserver;
 import org.hyperledger.fabric.traces.Traces;
 
 public class ChaincodeSupportClient {
@@ -29,9 +27,7 @@ public class ChaincodeSupportClient {
     private final ManagedChannel channel;
     private final ChaincodeSupportStub stub;
 
-    /**
-     * @param channelBuilder
-     */
+    /** @param channelBuilder */
     public ChaincodeSupportClient(final ManagedChannelBuilder channelBuilder) {
         ClientInterceptor interceptor = Traces.getProvider().createInterceptor();
         if (interceptor != null) {
@@ -41,10 +37,7 @@ public ChaincodeSupportClient(final ManagedChannelBuilder channelBuilder) {
         this.stub = ChaincodeSupportGrpc.newStub(channel);
     }
 
-    /**
-     *
-     * @param itm
-     */
+    /** @param itm */
     public void shutdown(final InvocationTaskManager itm) {
 
         // first shutdown the thread pool
@@ -59,16 +52,15 @@ public void shutdown(final InvocationTaskManager itm) {
             channel.shutdownNow();
             Thread.currentThread().interrupt();
         }
-
     }
 
     /**
-     *
      * @param itm
      * @param requestObserver
      * @throws IOException verify parameters error
      */
-    public void start(final InvocationTaskManager itm, final StreamObserver requestObserver) throws IOException {
+    public void start(final InvocationTaskManager itm, final StreamObserver requestObserver)
+            throws IOException {
         if (requestObserver == null) {
             throw new IOException("StreamObserver 'requestObserver' for chat with peer can't be null");
         }
@@ -110,6 +102,7 @@ public void accept(final ChaincodeMessage t) {
 
     /**
      * ChaincodeSupportStub.
+     *
      * @return stub
      */
     public ChaincodeSupportStub getStub() {
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationStubImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationStubImpl.java
index 08783272..809b36a5 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationStubImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationStubImpl.java
@@ -13,6 +13,9 @@
 import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.GET_QUERY_RESULT;
 import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.GET_STATE_BY_RANGE;
 
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.Timestamp;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.security.MessageDigest;
@@ -25,28 +28,27 @@
 import java.util.function.Function;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-
 import org.hyperledger.fabric.protos.common.ChannelHeader;
 import org.hyperledger.fabric.protos.common.Header;
 import org.hyperledger.fabric.protos.common.HeaderType;
 import org.hyperledger.fabric.protos.common.SignatureHeader;
 import org.hyperledger.fabric.protos.ledger.queryresult.KV;
+import org.hyperledger.fabric.protos.peer.ChaincodeEvent;
 import org.hyperledger.fabric.protos.peer.ChaincodeID;
 import org.hyperledger.fabric.protos.peer.ChaincodeInput;
-import org.hyperledger.fabric.protos.peer.ChaincodeSpec;
-import org.hyperledger.fabric.protos.peer.ChaincodeEvent;
-import org.hyperledger.fabric.protos.peer.QueryMetadata;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
+import org.hyperledger.fabric.protos.peer.ChaincodeProposalPayload;
+import org.hyperledger.fabric.protos.peer.ChaincodeSpec;
 import org.hyperledger.fabric.protos.peer.GetQueryResult;
 import org.hyperledger.fabric.protos.peer.GetState;
 import org.hyperledger.fabric.protos.peer.GetStateByRange;
-import org.hyperledger.fabric.protos.peer.QueryResultBytes;
-import org.hyperledger.fabric.protos.peer.StateMetadataResult;
-import org.hyperledger.fabric.protos.peer.ChaincodeProposalPayload;
+import org.hyperledger.fabric.protos.peer.MetaDataKeys;
 import org.hyperledger.fabric.protos.peer.Proposal;
-import org.hyperledger.fabric.protos.peer.SignedProposal;
+import org.hyperledger.fabric.protos.peer.QueryMetadata;
+import org.hyperledger.fabric.protos.peer.QueryResultBytes;
 import org.hyperledger.fabric.protos.peer.Response;
-import org.hyperledger.fabric.protos.peer.MetaDataKeys;
+import org.hyperledger.fabric.protos.peer.SignedProposal;
+import org.hyperledger.fabric.protos.peer.StateMetadataResult;
 import org.hyperledger.fabric.shim.Chaincode;
 import org.hyperledger.fabric.shim.ChaincodeStub;
 import org.hyperledger.fabric.shim.ledger.CompositeKey;
@@ -55,10 +57,6 @@
 import org.hyperledger.fabric.shim.ledger.QueryResultsIterator;
 import org.hyperledger.fabric.shim.ledger.QueryResultsIteratorWithMetadata;
 
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.Timestamp;
-
 class InvocationStubImpl implements ChaincodeStub {
 
     private static final String UNSPECIFIED_START_KEY = new String(Character.toChars(0x000001));
@@ -79,7 +77,6 @@ class InvocationStubImpl implements ChaincodeStub {
     private ChaincodeEvent event;
 
     /**
-     *
      * @param message
      * @param handler
      * @throws InvalidProtocolBufferException
@@ -93,7 +90,8 @@ class InvocationStubImpl implements ChaincodeStub {
 
         this.args = Collections.unmodifiableList(input.getArgsList());
         this.signedProposal = message.getProposal();
-        if (this.signedProposal == null || this.signedProposal.getProposalBytes().isEmpty()) {
+        if (this.signedProposal == null
+                || this.signedProposal.getProposalBytes().isEmpty()) {
             this.creator = null;
             this.txTimestamp = null;
             this.transientMap = Collections.emptyMap();
@@ -105,8 +103,8 @@ class InvocationStubImpl implements ChaincodeStub {
                 final ChannelHeader channelHeader = ChannelHeader.parseFrom(header.getChannelHeader());
                 validateProposalType(channelHeader);
                 final SignatureHeader signatureHeader = SignatureHeader.parseFrom(header.getSignatureHeader());
-                final ChaincodeProposalPayload chaincodeProposalPayload = ChaincodeProposalPayload
-                        .parseFrom(proposal.getPayload());
+                final ChaincodeProposalPayload chaincodeProposalPayload =
+                        ChaincodeProposalPayload.parseFrom(proposal.getPayload());
                 final Timestamp timestamp = channelHeader.getTimestamp();
 
                 this.txTimestamp = Instant.ofEpochSecond(timestamp.getSeconds(), timestamp.getNanos());
@@ -124,8 +122,8 @@ private byte[] computeBinding(final ChannelHeader channelHeader, final Signature
         final MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
         messageDigest.update(signatureHeader.getNonce().asReadOnlyByteBuffer());
         messageDigest.update(this.creator.asReadOnlyByteBuffer());
-        final ByteBuffer epochBytes = ByteBuffer.allocate(Long.BYTES).order(ByteOrder.LITTLE_ENDIAN)
-                .putLong(channelHeader.getEpoch());
+        final ByteBuffer epochBytes =
+                ByteBuffer.allocate(Long.BYTES).order(ByteOrder.LITTLE_ENDIAN).putLong(channelHeader.getEpoch());
         epochBytes.flip();
         messageDigest.update(epochBytes);
         return messageDigest.digest();
@@ -133,12 +131,12 @@ private byte[] computeBinding(final ChannelHeader channelHeader, final Signature
 
     private void validateProposalType(final ChannelHeader channelHeader) {
         switch (HeaderType.forNumber(channelHeader.getType())) {
-        case ENDORSER_TRANSACTION:
-        case CONFIG:
-            return;
-        default:
-            throw new RuntimeException(
-                    String.format("Unexpected transaction type: %s", HeaderType.forNumber(channelHeader.getType())));
+            case ENDORSER_TRANSACTION:
+            case CONFIG:
+                return;
+            default:
+                throw new RuntimeException(String.format(
+                        "Unexpected transaction type: %s", HeaderType.forNumber(channelHeader.getType())));
         }
     }
 
@@ -168,7 +166,9 @@ public void setEvent(final String name, final byte[] payload) {
             throw new IllegalArgumentException("event name can not be nil string");
         }
         if (payload != null) {
-            this.event = ChaincodeEvent.newBuilder().setEventName(name).setPayload(ByteString.copyFrom(payload))
+            this.event = ChaincodeEvent.newBuilder()
+                    .setEventName(name)
+                    .setPayload(ByteString.copyFrom(payload))
                     .build();
         } else {
             this.event = ChaincodeEvent.newBuilder().setEventName(name).build();
@@ -192,23 +192,26 @@ public String getTxId() {
 
     @Override
     public byte[] getState(final String key) {
-        return this.handler.invoke(ChaincodeMessageFactory.newGetStateEventMessage(channelId, txId, "", key))
+        return this.handler
+                .invoke(ChaincodeMessageFactory.newGetStateEventMessage(channelId, txId, "", key))
                 .toByteArray();
     }
 
     @Override
     public byte[] getStateValidationParameter(final String key) {
 
-        final ByteString payload = handler
-                .invoke(ChaincodeMessageFactory.newGetStateMetadataEventMessage(channelId, txId, "", key));
+        final ByteString payload =
+                handler.invoke(ChaincodeMessageFactory.newGetStateMetadataEventMessage(channelId, txId, "", key));
         try {
             final StateMetadataResult stateMetadataResult = StateMetadataResult.parseFrom(payload);
             final Map stateMetadataMap = new HashMap<>();
-            stateMetadataResult.getEntriesList()
+            stateMetadataResult
+                    .getEntriesList()
                     .forEach(entry -> stateMetadataMap.put(entry.getMetakey(), entry.getValue()));
 
             if (stateMetadataMap.containsKey(MetaDataKeys.VALIDATION_PARAMETER.toString())) {
-                return stateMetadataMap.get(MetaDataKeys.VALIDATION_PARAMETER.toString())
+                return stateMetadataMap
+                        .get(MetaDataKeys.VALIDATION_PARAMETER.toString())
                         .toByteArray();
             }
         } catch (final InvalidProtocolBufferException e) {
@@ -217,7 +220,6 @@ public byte[] getStateValidationParameter(final String key) {
         }
 
         return null;
-
     }
 
     @Override
@@ -230,8 +232,8 @@ public void putState(final String key, final byte[] value) {
     @Override
     public void setStateValidationParameter(final String key, final byte[] value) {
         validateKey(key);
-        final ChaincodeMessage msg = ChaincodeMessageFactory.newPutStateMetadataEventMessage(channelId, txId, "", key,
-                MetaDataKeys.VALIDATION_PARAMETER.toString(), ByteString.copyFrom(value));
+        final ChaincodeMessage msg = ChaincodeMessageFactory.newPutStateMetadataEventMessage(
+                channelId, txId, "", key, MetaDataKeys.VALIDATION_PARAMETER.toString(), ByteString.copyFrom(value));
         this.handler.invoke(msg);
     }
 
@@ -257,19 +259,22 @@ public QueryResultsIterator getStateByRange(final String startKey, fin
         return executeGetStateByRange("", start, end);
     }
 
-    private QueryResultsIterator executeGetStateByRange(final String collection, final String startKey,
-            final String endKey) {
+    private QueryResultsIterator executeGetStateByRange(
+            final String collection, final String startKey, final String endKey) {
 
-        final ByteString requestPayload = GetStateByRange.newBuilder().setCollection(collection).setStartKey(startKey)
-                .setEndKey(endKey).build().toByteString();
+        final ByteString requestPayload = GetStateByRange.newBuilder()
+                .setCollection(collection)
+                .setStartKey(startKey)
+                .setEndKey(endKey)
+                .build()
+                .toByteString();
 
-        final ChaincodeMessage requestMessage = ChaincodeMessageFactory.newEventMessage(GET_STATE_BY_RANGE, channelId,
-                txId, requestPayload);
+        final ChaincodeMessage requestMessage =
+                ChaincodeMessageFactory.newEventMessage(GET_STATE_BY_RANGE, channelId, txId, requestPayload);
         final ByteString response = handler.invoke(requestMessage);
 
-        return new QueryResultsIteratorImpl(this.handler, channelId, txId, response,
-                queryResultBytesToKv.andThen(KeyValueImpl::new));
-
+        return new QueryResultsIteratorImpl(
+                this.handler, channelId, txId, response, queryResultBytesToKv.andThen(KeyValueImpl::new));
     }
 
     private final Function queryResultBytesToKv = new Function() {
@@ -281,12 +286,11 @@ public KV apply(final QueryResultBytes queryResultBytes) {
                 throw new RuntimeException(e);
             }
         }
-
     };
 
     @Override
-    public QueryResultsIteratorWithMetadata getStateByRangeWithPagination(final String startKey,
-            final String endKey, final int pageSize, final String bookmark) {
+    public QueryResultsIteratorWithMetadata getStateByRangeWithPagination(
+            final String startKey, final String endKey, final int pageSize, final String bookmark) {
 
         String start = startKey;
         String end = endKey;
@@ -300,26 +304,32 @@ public QueryResultsIteratorWithMetadata getStateByRangeWithPagination(
 
         CompositeKey.validateSimpleKeys(start, end);
 
-        final QueryMetadata queryMetadata = QueryMetadata.newBuilder().setBookmark(bookmark)
-                .setPageSize(pageSize).build();
+        final QueryMetadata queryMetadata = QueryMetadata.newBuilder()
+                .setBookmark(bookmark)
+                .setPageSize(pageSize)
+                .build();
 
         return executeGetStateByRangeWithMetadata("", start, end, queryMetadata.toByteString());
     }
 
-    private QueryResultsIteratorWithMetadataImpl executeGetStateByRangeWithMetadata(final String collection,
-            final String startKey, final String endKey, final ByteString metadata) {
+    private QueryResultsIteratorWithMetadataImpl executeGetStateByRangeWithMetadata(
+            final String collection, final String startKey, final String endKey, final ByteString metadata) {
 
-        final ByteString payload = GetStateByRange.newBuilder().setCollection(collection).setStartKey(startKey)
-                .setEndKey(endKey).setMetadata(metadata).build().toByteString();
+        final ByteString payload = GetStateByRange.newBuilder()
+                .setCollection(collection)
+                .setStartKey(startKey)
+                .setEndKey(endKey)
+                .setMetadata(metadata)
+                .build()
+                .toByteString();
 
-        final ChaincodeMessage requestMessage = ChaincodeMessageFactory.newEventMessage(GET_STATE_BY_RANGE, channelId,
-                txId, payload);
+        final ChaincodeMessage requestMessage =
+                ChaincodeMessageFactory.newEventMessage(GET_STATE_BY_RANGE, channelId, txId, payload);
 
         final ByteString response = this.handler.invoke(requestMessage);
 
-        return new QueryResultsIteratorWithMetadataImpl<>(this.handler, getChannelId(), getTxId(), response,
-                queryResultBytesToKv.andThen(KeyValueImpl::new));
-
+        return new QueryResultsIteratorWithMetadataImpl<>(
+                this.handler, getChannelId(), getTxId(), response, queryResultBytesToKv.andThen(KeyValueImpl::new));
     }
 
     @Override
@@ -337,8 +347,8 @@ public QueryResultsIterator getStateByPartialCompositeKey(final String
     }
 
     @Override
-    public QueryResultsIterator getStateByPartialCompositeKey(final String objectType,
-            final String... attributes) {
+    public QueryResultsIterator getStateByPartialCompositeKey(
+            final String objectType, final String... attributes) {
         return getStateByPartialCompositeKey(new CompositeKey(objectType, attributes));
     }
 
@@ -368,11 +378,13 @@ public QueryResultsIteratorWithMetadata getStateByPartialCompositeKeyW
             cKeyAsString = compositeKey.toString();
         }
 
-        final QueryMetadata queryMetadata = QueryMetadata.newBuilder().setBookmark(bookmark)
-                .setPageSize(pageSize).build();
+        final QueryMetadata queryMetadata = QueryMetadata.newBuilder()
+                .setBookmark(bookmark)
+                .setPageSize(pageSize)
+                .build();
 
-        return executeGetStateByRangeWithMetadata("", cKeyAsString, cKeyAsString + MAX_UNICODE_RUNE,
-                queryMetadata.toByteString());
+        return executeGetStateByRangeWithMetadata(
+                "", cKeyAsString, cKeyAsString + MAX_UNICODE_RUNE, queryMetadata.toByteString());
     }
 
     @Override
@@ -388,63 +400,82 @@ public CompositeKey splitCompositeKey(final String compositeKey) {
     @Override
     public QueryResultsIterator getQueryResult(final String query) {
 
-        final ByteString requestPayload = GetQueryResult.newBuilder().setCollection("").setQuery(query).build()
+        final ByteString requestPayload = GetQueryResult.newBuilder()
+                .setCollection("")
+                .setQuery(query)
+                .build()
                 .toByteString();
-        final ChaincodeMessage requestMessage = ChaincodeMessageFactory.newEventMessage(GET_QUERY_RESULT, channelId,
-                txId, requestPayload);
+        final ChaincodeMessage requestMessage =
+                ChaincodeMessageFactory.newEventMessage(GET_QUERY_RESULT, channelId, txId, requestPayload);
         final ByteString response = handler.invoke(requestMessage);
 
-        return new QueryResultsIteratorImpl(this.handler, channelId, txId, response,
-                queryResultBytesToKv.andThen(KeyValueImpl::new));
+        return new QueryResultsIteratorImpl(
+                this.handler, channelId, txId, response, queryResultBytesToKv.andThen(KeyValueImpl::new));
     }
 
     @Override
-    public QueryResultsIteratorWithMetadata getQueryResultWithPagination(final String query,
-            final int pageSize, final String bookmark) {
+    public QueryResultsIteratorWithMetadata getQueryResultWithPagination(
+            final String query, final int pageSize, final String bookmark) {
 
-        final ByteString queryMetadataPayload = QueryMetadata.newBuilder().setBookmark(bookmark)
-                .setPageSize(pageSize).build().toByteString();
-        final ByteString requestPayload = GetQueryResult.newBuilder().setCollection("").setQuery(query)
-                .setMetadata(queryMetadataPayload).build().toByteString();
-        final ChaincodeMessage requestMessage = ChaincodeMessageFactory.newEventMessage(GET_QUERY_RESULT, channelId,
-                txId, requestPayload);
+        final ByteString queryMetadataPayload = QueryMetadata.newBuilder()
+                .setBookmark(bookmark)
+                .setPageSize(pageSize)
+                .build()
+                .toByteString();
+        final ByteString requestPayload = GetQueryResult.newBuilder()
+                .setCollection("")
+                .setQuery(query)
+                .setMetadata(queryMetadataPayload)
+                .build()
+                .toByteString();
+        final ChaincodeMessage requestMessage =
+                ChaincodeMessageFactory.newEventMessage(GET_QUERY_RESULT, channelId, txId, requestPayload);
         final ByteString response = handler.invoke(requestMessage);
 
-        return new QueryResultsIteratorWithMetadataImpl(this.handler, channelId, txId, response,
-                queryResultBytesToKv.andThen(KeyValueImpl::new));
-
+        return new QueryResultsIteratorWithMetadataImpl(
+                this.handler, channelId, txId, response, queryResultBytesToKv.andThen(KeyValueImpl::new));
     }
 
     @Override
     public QueryResultsIterator getHistoryForKey(final String key) {
 
-        final ByteString requestPayload = GetQueryResult.newBuilder().setCollection("").setQuery(key).build()
+        final ByteString requestPayload = GetQueryResult.newBuilder()
+                .setCollection("")
+                .setQuery(key)
+                .build()
                 .toByteString();
-        final ChaincodeMessage requestMessage = ChaincodeMessageFactory.newEventMessage(GET_HISTORY_FOR_KEY, channelId,
-                txId, requestPayload);
+        final ChaincodeMessage requestMessage =
+                ChaincodeMessageFactory.newEventMessage(GET_HISTORY_FOR_KEY, channelId, txId, requestPayload);
         final ByteString response = handler.invoke(requestMessage);
 
-        return new QueryResultsIteratorImpl(this.handler, channelId, txId, response,
+        return new QueryResultsIteratorImpl(
+                this.handler,
+                channelId,
+                txId,
+                response,
                 queryResultBytesToKeyModification.andThen(KeyModificationImpl::new));
-
     }
 
-    private final Function queryResultBytesToKeyModification =
-            new Function() {
-        @Override
-        public org.hyperledger.fabric.protos.ledger.queryresult.KeyModification apply(final QueryResultBytes queryResultBytes) {
-            try {
-                return org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.parseFrom(queryResultBytes.getResultBytes());
-            } catch (final InvalidProtocolBufferException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    };
+    private final Function
+            queryResultBytesToKeyModification =
+                    new Function() {
+                        @Override
+                        public org.hyperledger.fabric.protos.ledger.queryresult.KeyModification apply(
+                                final QueryResultBytes queryResultBytes) {
+                            try {
+                                return org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.parseFrom(
+                                        queryResultBytes.getResultBytes());
+                            } catch (final InvalidProtocolBufferException e) {
+                                throw new RuntimeException(e);
+                            }
+                        }
+                    };
 
     @Override
     public byte[] getPrivateData(final String collection, final String key) {
         validateCollection(collection);
-        return this.handler.invoke(ChaincodeMessageFactory.newGetStateEventMessage(channelId, txId, collection, key))
+        return this.handler
+                .invoke(ChaincodeMessageFactory.newGetStateEventMessage(channelId, txId, collection, key))
                 .toByteArray();
     }
 
@@ -453,10 +484,13 @@ public byte[] getPrivateDataHash(final String collection, final String key) {
 
         validateCollection(collection);
 
-        final ByteString requestPayload = GetState.newBuilder().setCollection(collection).setKey(key).build()
+        final ByteString requestPayload = GetState.newBuilder()
+                .setCollection(collection)
+                .setKey(key)
+                .build()
                 .toByteString();
-        final ChaincodeMessage requestMessage = ChaincodeMessageFactory.newEventMessage(GET_PRIVATE_DATA_HASH,
-                channelId, txId, requestPayload);
+        final ChaincodeMessage requestMessage =
+                ChaincodeMessageFactory.newEventMessage(GET_PRIVATE_DATA_HASH, channelId, txId, requestPayload);
 
         return handler.invoke(requestMessage).toByteArray();
     }
@@ -465,16 +499,18 @@ public byte[] getPrivateDataHash(final String collection, final String key) {
     public byte[] getPrivateDataValidationParameter(final String collection, final String key) {
         validateCollection(collection);
 
-        final ByteString payload = handler
-                .invoke(ChaincodeMessageFactory.newGetStateMetadataEventMessage(channelId, txId, collection, key));
+        final ByteString payload = handler.invoke(
+                ChaincodeMessageFactory.newGetStateMetadataEventMessage(channelId, txId, collection, key));
         try {
             final StateMetadataResult stateMetadataResult = StateMetadataResult.parseFrom(payload);
             final Map stateMetadataMap = new HashMap<>();
-            stateMetadataResult.getEntriesList()
+            stateMetadataResult
+                    .getEntriesList()
                     .forEach(entry -> stateMetadataMap.put(entry.getMetakey(), entry.getValue()));
 
             if (stateMetadataMap.containsKey(MetaDataKeys.VALIDATION_PARAMETER.toString())) {
-                return stateMetadataMap.get(MetaDataKeys.VALIDATION_PARAMETER.toString())
+                return stateMetadataMap
+                        .get(MetaDataKeys.VALIDATION_PARAMETER.toString())
                         .toByteArray();
             }
         } catch (final InvalidProtocolBufferException e) {
@@ -489,16 +525,20 @@ public byte[] getPrivateDataValidationParameter(final String collection, final S
     public void putPrivateData(final String collection, final String key, final byte[] value) {
         validateKey(key);
         validateCollection(collection);
-        this.handler.invoke(ChaincodeMessageFactory.newPutStateEventMessage(channelId, txId, collection, key,
-                ByteString.copyFrom(value)));
+        this.handler.invoke(ChaincodeMessageFactory.newPutStateEventMessage(
+                channelId, txId, collection, key, ByteString.copyFrom(value)));
     }
 
     @Override
     public void setPrivateDataValidationParameter(final String collection, final String key, final byte[] value) {
         validateKey(key);
         validateCollection(collection);
-        final ChaincodeMessage msg = ChaincodeMessageFactory.newPutStateMetadataEventMessage(channelId, txId,
-                collection, key, MetaDataKeys.VALIDATION_PARAMETER.toString(),
+        final ChaincodeMessage msg = ChaincodeMessageFactory.newPutStateMetadataEventMessage(
+                channelId,
+                txId,
+                collection,
+                key,
+                MetaDataKeys.VALIDATION_PARAMETER.toString(),
                 ByteString.copyFrom(value));
         this.handler.invoke(msg);
     }
@@ -506,22 +546,22 @@ public void setPrivateDataValidationParameter(final String collection, final Str
     @Override
     public void delPrivateData(final String collection, final String key) {
         validateCollection(collection);
-        final ChaincodeMessage msg = ChaincodeMessageFactory.newDeleteStateEventMessage(channelId, txId, collection,
-                key);
+        final ChaincodeMessage msg =
+                ChaincodeMessageFactory.newDeleteStateEventMessage(channelId, txId, collection, key);
         this.handler.invoke(msg);
     }
 
     @Override
     public void purgePrivateData(final String collection, final String key) {
         validateCollection(collection);
-        final ChaincodeMessage msg = ChaincodeMessageFactory.newPurgeStateEventMessage(channelId, txId, collection,
-                key);
+        final ChaincodeMessage msg =
+                ChaincodeMessageFactory.newPurgeStateEventMessage(channelId, txId, collection, key);
         this.handler.invoke(msg);
     }
 
     @Override
-    public QueryResultsIterator getPrivateDataByRange(final String collection, final String startKey,
-            final String endKey) {
+    public QueryResultsIterator getPrivateDataByRange(
+            final String collection, final String startKey, final String endKey) {
         String start = startKey;
         String end = endKey;
 
@@ -538,8 +578,8 @@ public QueryResultsIterator getPrivateDataByRange(final String collect
     }
 
     @Override
-    public QueryResultsIterator getPrivateDataByPartialCompositeKey(final String collection,
-            final String compositeKey) {
+    public QueryResultsIterator getPrivateDataByPartialCompositeKey(
+            final String collection, final String compositeKey) {
 
         CompositeKey key;
 
@@ -555,8 +595,8 @@ public QueryResultsIterator getPrivateDataByPartialCompositeKey(final
     }
 
     @Override
-    public QueryResultsIterator getPrivateDataByPartialCompositeKey(final String collection,
-            final CompositeKey compositeKey) {
+    public QueryResultsIterator getPrivateDataByPartialCompositeKey(
+            final String collection, final CompositeKey compositeKey) {
         String cKeyAsString;
         if (compositeKey == null) {
             cKeyAsString = new CompositeKey(UNSPECIFIED_START_KEY).toString();
@@ -568,26 +608,30 @@ public QueryResultsIterator getPrivateDataByPartialCompositeKey(final
     }
 
     @Override
-    public QueryResultsIterator getPrivateDataByPartialCompositeKey(final String collection,
-            final String objectType, final String... attributes) {
+    public QueryResultsIterator getPrivateDataByPartialCompositeKey(
+            final String collection, final String objectType, final String... attributes) {
         return getPrivateDataByPartialCompositeKey(collection, new CompositeKey(objectType, attributes));
     }
 
     @Override
     public QueryResultsIterator getPrivateDataQueryResult(final String collection, final String query) {
         validateCollection(collection);
-        final ByteString requestPayload = GetQueryResult.newBuilder().setCollection(collection).setQuery(query).build()
+        final ByteString requestPayload = GetQueryResult.newBuilder()
+                .setCollection(collection)
+                .setQuery(query)
+                .build()
                 .toByteString();
-        final ChaincodeMessage requestMessage = ChaincodeMessageFactory.newEventMessage(GET_QUERY_RESULT, channelId,
-                txId, requestPayload);
+        final ChaincodeMessage requestMessage =
+                ChaincodeMessageFactory.newEventMessage(GET_QUERY_RESULT, channelId, txId, requestPayload);
         final ByteString response = handler.invoke(requestMessage);
 
-        return new QueryResultsIteratorImpl(this.handler, channelId, txId, response,
-                queryResultBytesToKv.andThen(KeyValueImpl::new));
+        return new QueryResultsIteratorImpl(
+                this.handler, channelId, txId, response, queryResultBytesToKv.andThen(KeyValueImpl::new));
     }
 
     @Override
-    public Chaincode.Response invokeChaincode(final String chaincodeName, final List args, final String channel) {
+    public Chaincode.Response invokeChaincode(
+            final String chaincodeName, final List args, final String channel) {
         // internally we handle chaincode name as a composite name
         final String compositeName;
         if (channel != null && !channel.trim().isEmpty()) {
@@ -600,11 +644,13 @@ public Chaincode.Response invokeChaincode(final String chaincodeName, final List
         final ByteString invocationSpecPayload = ChaincodeSpec.newBuilder()
                 .setChaincodeId(ChaincodeID.newBuilder().setName(compositeName).build())
                 .setInput(ChaincodeInput.newBuilder()
-                        .addAllArgs(args.stream().map(ByteString::copyFrom).collect(Collectors.toList())).build())
-                .build().toByteString();
+                        .addAllArgs(args.stream().map(ByteString::copyFrom).collect(Collectors.toList()))
+                        .build())
+                .build()
+                .toByteString();
 
-        final ChaincodeMessage invokeChaincodeMessage = ChaincodeMessageFactory
-                .newInvokeChaincodeMessage(this.channelId, this.txId, invocationSpecPayload);
+        final ChaincodeMessage invokeChaincodeMessage =
+                ChaincodeMessageFactory.newInvokeChaincodeMessage(this.channelId, this.txId, invocationSpecPayload);
         final ByteString response = this.handler.invoke(invokeChaincodeMessage);
 
         try {
@@ -613,14 +659,15 @@ public Chaincode.Response invokeChaincode(final String chaincodeName, final List
             final ChaincodeMessage responseMessage = ChaincodeMessage.parseFrom(response);
             // the actual response message must be of type COMPLETED
 
-            LOGGER.fine(String.format("[%-8.8s] %s response received from other chaincode.", txId,
-                    responseMessage.getType()));
+            LOGGER.fine(String.format(
+                    "[%-8.8s] %s response received from other chaincode.", txId, responseMessage.getType()));
 
             if (responseMessage.getType() == COMPLETED) {
                 // success
-                final Response r = Response
-                        .parseFrom(responseMessage.getPayload());
-                return new Chaincode.Response(Chaincode.Response.Status.forCode(r.getStatus()), r.getMessage(),
+                final Response r = Response.parseFrom(responseMessage.getPayload());
+                return new Chaincode.Response(
+                        Chaincode.Response.Status.forCode(r.getStatus()),
+                        r.getMessage(),
                         r.getPayload() == null ? null : r.getPayload().toByteArray());
             } else {
                 // error
@@ -630,7 +677,6 @@ public Chaincode.Response invokeChaincode(final String chaincodeName, final List
         } catch (final InvalidProtocolBufferException e) {
             throw new RuntimeException(e);
         }
-
     }
 
     @Override
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationTaskExecutor.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationTaskExecutor.java
index 97d68fbd..c2402e48 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationTaskExecutor.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationTaskExecutor.java
@@ -12,19 +12,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
-
 import org.hyperledger.fabric.metrics.TaskMetricsCollector;
 
-/**
- *
- *
- *
- */
+/** */
 public final class InvocationTaskExecutor extends ThreadPoolExecutor implements TaskMetricsCollector {
     private static Logger logger = Logger.getLogger(InvocationTaskExecutor.class.getName());
 
     /**
-     *
      * @param corePoolSize
      * @param maximumPoolSize
      * @param keepAliveTime
@@ -33,8 +27,14 @@ public final class InvocationTaskExecutor extends ThreadPoolExecutor implements
      * @param factory
      * @param handler
      */
-    public InvocationTaskExecutor(final int corePoolSize, final int maximumPoolSize, final long keepAliveTime, final TimeUnit unit,
-            final BlockingQueue workQueue, final ThreadFactory factory, final RejectedExecutionHandler handler) {
+    public InvocationTaskExecutor(
+            final int corePoolSize,
+            final int maximumPoolSize,
+            final long keepAliveTime,
+            final TimeUnit unit,
+            final BlockingQueue workQueue,
+            final ThreadFactory factory,
+            final RejectedExecutionHandler handler) {
         super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, factory, handler);
         prestartCoreThread();
         logger.info("Thread pool created");
@@ -46,7 +46,6 @@ public InvocationTaskExecutor(final int corePoolSize, final int maximumPoolSize,
     protected void beforeExecute(final Thread thread, final Runnable task) {
         super.beforeExecute(thread, task);
         count.incrementAndGet();
-
     }
 
     @Override
@@ -64,5 +63,4 @@ public int getCurrentTaskCount() {
     public int getCurrentQueueCount() {
         return this.getQueue().size();
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationTaskManager.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationTaskManager.java
index 424f3a84..2de85597 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationTaskManager.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationTaskManager.java
@@ -22,7 +22,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
-
 import org.hyperledger.fabric.Logging;
 import org.hyperledger.fabric.metrics.Metrics;
 import org.hyperledger.fabric.protos.peer.ChaincodeID;
@@ -31,13 +30,10 @@
 import org.hyperledger.fabric.shim.ChaincodeBase;
 
 /**
- * The InvocationTask Manager handles the message level communication with the
- * peer.
- *
- * In the current 1.4 Fabric Protocol this is in practice a singleton - because
- * the peer will ignore multiple 'register' calls. And an instance of this will
- * be created per register call for a given chaincodeID.
+ * The InvocationTask Manager handles the message level communication with the peer.
  *
+ * 
In the current 1.4 Fabric Protocol this is in practice a singleton - because the peer will ignore multiple
+ * 'register' calls. And an instance of this will be created per register call for a given chaincodeID.
  */
 public final class InvocationTaskManager {
 
@@ -47,7 +43,7 @@ public final class InvocationTaskManager {
     /**
      * Get an instance of the Invocation Task Manager.
      *
-     * @param chaincode   Chaincode Instance
+     * @param chaincode Chaincode Instance
      * @param chaincodeId ID of the chaincode
      * @return InvocationTaskManager
      */
@@ -84,7 +80,6 @@ public Thread newThread(final Runnable r) {
             Thread thread = Executors.defaultThreadFactory().newThread(r);
             thread.setName("fabric-txinvoke:" + next.incrementAndGet());
             return thread;
-
         }
     };
 
@@ -102,7 +97,7 @@ public Thread newThread(final Runnable r) {
     /**
      * New InvocationTaskManager.
      *
-     * @param chaincode   Chaincode Instance
+     * @param chaincode Chaincode Instance
      * @param chaincodeId ID of the chaincode
      */
     public InvocationTaskManager(final ChaincodeBase chaincode, final ChaincodeID chaincodeId) {
@@ -128,11 +123,10 @@ public InvocationTaskManager(final ChaincodeBase chaincode, final ChaincodeID ch
         logger.info(() -> "Keep Alive Time [TP_KEEP_ALIVE_MS]" + keepAliveTime);
 
         workQueue = new LinkedBlockingQueue(queueSize);
-        taskService = new InvocationTaskExecutor(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue,
-                threadFactory, handler);
+        taskService = new InvocationTaskExecutor(
+                corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, handler);
 
         Metrics.getProvider().setTaskMetricsCollector(taskService);
-
     }
 
     /**
@@ -145,35 +139,38 @@ public void onChaincodeMessage(final ChaincodeMessage chaincodeMessage) throws I
         if (chaincodeMessage == null) {
             throw new IllegalArgumentException("chaincodeMessage is null");
         }
-        logger.fine(() -> String.format("[%-8.8s] %s", chaincodeMessage.getTxid(), ChaincodeBase.toJsonString(chaincodeMessage)));
+        logger.fine(() ->
+                String.format("[%-8.8s] %s", chaincodeMessage.getTxid(), ChaincodeBase.toJsonString(chaincodeMessage)));
         try {
             final Type msgType = chaincodeMessage.getType();
             switch (chaincode.getState()) {
                 case CREATED:
                     if (msgType == REGISTERED) {
                         chaincode.setState(org.hyperledger.fabric.shim.ChaincodeBase.CCState.ESTABLISHED);
-                        logger.fine(() -> String.format("[%-8.8s] Received REGISTERED: moving to established state",
+                        logger.fine(() -> String.format(
+                                "[%-8.8s] Received REGISTERED: moving to established state",
                                 chaincodeMessage.getTxid()));
                     } else {
-                        logger.warning(() -> String.format("[%-8.8s] Received %s: cannot handle",
-                                chaincodeMessage.getTxid(), msgType));
+                        logger.warning(() -> String.format(
+                                "[%-8.8s] Received %s: cannot handle", chaincodeMessage.getTxid(), msgType));
                     }
                     break;
                 case ESTABLISHED:
                     if (msgType == READY) {
                         chaincode.setState(org.hyperledger.fabric.shim.ChaincodeBase.CCState.READY);
-                        logger.fine(() -> String.format("[%-8.8s] Received READY: ready for invocations",
-                                chaincodeMessage.getTxid()));
+                        logger.fine(() -> String.format(
+                                "[%-8.8s] Received READY: ready for invocations", chaincodeMessage.getTxid()));
                     } else {
-                        logger.warning(() -> String.format("[%-8.8s] Received %s: cannot handle",
-                                chaincodeMessage.getTxid(), msgType));
+                        logger.warning(() -> String.format(
+                                "[%-8.8s] Received %s: cannot handle", chaincodeMessage.getTxid(), msgType));
                     }
                     break;
                 case READY:
                     handleMsg(chaincodeMessage, msgType);
                     break;
                 default:
-                    logger.warning(() -> String.format("[%-8.8s] Received %s: cannot handle",
+                    logger.warning(() -> String.format(
+                            "[%-8.8s] Received %s: cannot handle",
                             chaincodeMessage.getTxid(), chaincodeMessage.getType()));
                     break;
             }
@@ -187,8 +184,7 @@ public void onChaincodeMessage(final ChaincodeMessage chaincodeMessage) throws I
     }
 
     /**
-     * Key method to take the message, determine if it is a new transaction or an
-     * answer (good or bad) to a stub api.
+     * Key method to take the message, determine if it is a new transaction or an answer (good or bad) to a stub api.
      *
      * @param message
      * @param msgType
@@ -205,15 +201,14 @@ private void handleMsg(final ChaincodeMessage message, final Type msgType) {
                 newTask(message, msgType);
                 break;
             default:
-                logger.warning(() -> String.format("[%-8.8s] Received %s: cannot handle", message.getTxid(),
-                        message.getType()));
+                logger.warning(() ->
+                        String.format("[%-8.8s] Received %s: cannot handle", message.getTxid(), message.getType()));
                 break;
         }
     }
 
     /**
-     * Send a message from the peer to the correct task. This will be a response to
-     * something like a getState() call.
+     * Send a message from the peer to the correct task. This will be a response to something like a getState() call.
      *
      * @param message ChaincodeMessage from the peer
      */
@@ -233,8 +228,8 @@ private void sendToTask(final ChaincodeMessage message) {
             logger.severe(
                     () -> "Failed to send response to the task task " + message.getTxid() + Logging.formatError(e));
 
-            final ChaincodeMessage m = ChaincodeMessageFactory.newErrorEventMessage(message.getChannelId(),
-                    message.getTxid(), "Failed to send response to task");
+            final ChaincodeMessage m = ChaincodeMessageFactory.newErrorEventMessage(
+                    message.getChannelId(), message.getTxid(), "Failed to send response to task");
             this.outgoingMessage.accept(m);
         }
     }
@@ -243,14 +238,13 @@ private void sendToTask(final ChaincodeMessage message) {
      * Create a new task to handle this transaction function.
      *
      * @param message ChaincodeMessage to process
-     * @param type    Type of message = INIT or INVOKE. INIT is deprecated in future
-     *                versions
+     * @param type Type of message = INIT or INVOKE. INIT is deprecated in future versions
      * @throws InterruptedException
      */
     private void newTask(final ChaincodeMessage message, final Type type) {
         String txid = message.getTxid();
-        final ChaincodeInvocationTask task = new ChaincodeInvocationTask(message, type, this.outgoingMessage,
-                this.chaincode);
+        final ChaincodeInvocationTask task =
+                new ChaincodeInvocationTask(message, type, this.outgoingMessage, this.chaincode);
 
         perflogger.fine(() -> "> newTask:created TX::" + txid);
 
@@ -260,9 +254,11 @@ private void newTask(final ChaincodeMessage message, final Type type) {
 
             // submit the task to run, with the taskService providing the
             // threading support.
-            final CompletableFuture response = CompletableFuture.runAsync(() -> {
-                task.call();
-            }, taskService);
+            final CompletableFuture response = CompletableFuture.runAsync(
+                    () -> {
+                        task.call();
+                    },
+                    taskService);
 
             // we have a future of the chaincode message that should be returned.
             // but waiting for this does not need to block this thread
@@ -281,11 +277,10 @@ private void newTask(final ChaincodeMessage message, final Type type) {
             // thread for processing, and there's no space left in the queue to hold
             // it pending
 
-            final ChaincodeMessage m = ChaincodeMessageFactory.newErrorEventMessage(message.getChannelId(), txid,
-                    "Failed to submit task for processing");
+            final ChaincodeMessage m = ChaincodeMessageFactory.newErrorEventMessage(
+                    message.getChannelId(), txid, "Failed to submit task for processing");
             this.outgoingMessage.accept(m);
         }
-
     }
 
     /**
@@ -320,9 +315,7 @@ public InvocationTaskManager register() throws IllegalArgumentException {
 
     private static final int SHUTDOWN_TIMEOUT = 60;
 
-    /**
-     *
-     */
+    /** */
     public void shutdown() {
         // Recommended shutdown process from
         // https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html
@@ -345,5 +338,4 @@ public void shutdown() {
             Thread.currentThread().interrupt();
         }
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/KeyModificationImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/KeyModificationImpl.java
index 42f77f73..2cecbf97 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/KeyModificationImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/KeyModificationImpl.java
@@ -5,12 +5,10 @@
  */
 package org.hyperledger.fabric.shim.impl;
 
+import com.google.protobuf.ByteString;
 import java.time.Instant;
-
 import org.hyperledger.fabric.shim.ledger.KeyModification;
 
-import com.google.protobuf.ByteString;
-
 public final class KeyModificationImpl implements KeyModification {
 
     private final String txId;
@@ -21,7 +19,8 @@ public final class KeyModificationImpl implements KeyModification {
     KeyModificationImpl(final org.hyperledger.fabric.protos.ledger.queryresult.KeyModification km) {
         this.txId = km.getTxId();
         this.value = km.getValue();
-        this.timestamp = Instant.ofEpochSecond(km.getTimestamp().getSeconds(), km.getTimestamp().getNanos());
+        this.timestamp = Instant.ofEpochSecond(
+                km.getTimestamp().getSeconds(), km.getTimestamp().getNanos());
         this.deleted = km.getIsDelete();
     }
 
@@ -87,5 +86,4 @@ public boolean equals(final Object obj) {
         }
         return true;
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/KeyValueImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/KeyValueImpl.java
index df9903cb..dbf1089f 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/KeyValueImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/KeyValueImpl.java
@@ -5,11 +5,10 @@
  */
 package org.hyperledger.fabric.shim.impl;
 
+import com.google.protobuf.ByteString;
 import org.hyperledger.fabric.protos.ledger.queryresult.KV;
 import org.hyperledger.fabric.shim.ledger.KeyValue;
 
-import com.google.protobuf.ByteString;
-
 class KeyValueImpl implements KeyValue {
 
     private final String key;
@@ -64,5 +63,4 @@ public boolean equals(final Object obj) {
         }
         return true;
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/QueryResultsIteratorImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/QueryResultsIteratorImpl.java
index a319d84b..874ae4f7 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/QueryResultsIteratorImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/QueryResultsIteratorImpl.java
@@ -9,11 +9,12 @@
 import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.QUERY_STATE_CLOSE;
 import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.QUERY_STATE_NEXT;
 
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.function.Function;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.QueryResponse;
 import org.hyperledger.fabric.protos.peer.QueryResultBytes;
@@ -21,17 +22,13 @@
 import org.hyperledger.fabric.protos.peer.QueryStateNext;
 import org.hyperledger.fabric.shim.ledger.QueryResultsIterator;
 
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
-
 /**
  * This class provides an ITERABLE object of query results.
  *
- * NOTE the class name
- * is misleading - as this class is not an iterator itself, rather it implements
+ * 
NOTE the class name is misleading - as this class is not an iterator itself, rather it implements
  * java.lang.Iterable via the QueryResultsIterator
  *
- * public interface QueryResultsIterator extends Iterable, AutoCloseable
+ * 
public interface QueryResultsIterator extends Iterable, AutoCloseable
  *
  * @param 
  */
@@ -44,7 +41,11 @@ class QueryResultsIteratorImpl implements QueryResultsIterator {
     private QueryResponse currentQueryResponse;
     private Function mapper;
 
-    QueryResultsIteratorImpl(final ChaincodeInvocationTask handler, final String channelId, final String txId, final ByteString responseBuffer,
+    QueryResultsIteratorImpl(
+            final ChaincodeInvocationTask handler,
+            final String channelId,
+            final String txId,
+            final ByteString responseBuffer,
             final Function mapper) {
 
         try {
@@ -83,8 +84,12 @@ public T next() {
 
                 // get more results from peer
 
-                final ByteString requestPayload = QueryStateNext.newBuilder().setId(currentQueryResponse.getId()).build().toByteString();
-                final ChaincodeMessage requestNextMessage = ChaincodeMessageFactory.newEventMessage(QUERY_STATE_NEXT, channelId, txId, requestPayload);
+                final ByteString requestPayload = QueryStateNext.newBuilder()
+                        .setId(currentQueryResponse.getId())
+                        .build()
+                        .toByteString();
+                final ChaincodeMessage requestNextMessage =
+                        ChaincodeMessageFactory.newEventMessage(QUERY_STATE_NEXT, channelId, txId, requestPayload);
 
                 final ByteString responseMessage = QueryResultsIteratorImpl.this.handler.invoke(requestNextMessage);
                 try {
@@ -96,22 +101,23 @@ public T next() {
 
                 // return next fetched result
                 return mapper.apply(currentIterator.next());
-
             }
-
         };
     }
 
     @Override
     public void close() throws Exception {
 
-        final ByteString requestPayload = QueryStateClose.newBuilder().setId(currentQueryResponse.getId()).build().toByteString();
+        final ByteString requestPayload = QueryStateClose.newBuilder()
+                .setId(currentQueryResponse.getId())
+                .build()
+                .toByteString();
 
-        final ChaincodeMessage requestNextMessage = ChaincodeMessageFactory.newEventMessage(QUERY_STATE_CLOSE, channelId, txId, requestPayload);
+        final ChaincodeMessage requestNextMessage =
+                ChaincodeMessageFactory.newEventMessage(QUERY_STATE_CLOSE, channelId, txId, requestPayload);
         this.handler.invoke(requestNextMessage);
 
         this.currentIterator = Collections.emptyIterator();
         this.currentQueryResponse = QueryResponse.newBuilder().setHasMore(false).build();
     }
-
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/QueryResultsIteratorWithMetadataImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/QueryResultsIteratorWithMetadataImpl.java
index 93b349db..26d24f55 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/QueryResultsIteratorWithMetadataImpl.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/QueryResultsIteratorWithMetadataImpl.java
@@ -6,41 +6,42 @@
 
 package org.hyperledger.fabric.shim.impl;
 
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.function.Function;
 import java.util.logging.Logger;
-
-import org.hyperledger.fabric.protos.peer.QueryResponseMetadata;
 import org.hyperledger.fabric.protos.peer.QueryResponse;
+import org.hyperledger.fabric.protos.peer.QueryResponseMetadata;
 import org.hyperledger.fabric.protos.peer.QueryResultBytes;
 import org.hyperledger.fabric.shim.ledger.QueryResultsIteratorWithMetadata;
 
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
-
 /**
  * QueryResult Iterator.
  *
- * Implementation of {@link QueryResultsIteratorWithMetadata}, by extending
- * {@link org.hyperledger.fabric.shim.ledger.QueryResultsIterator}
- * implementations, {@link QueryResultsIteratorImpl}
+ * 
Implementation of {@link QueryResultsIteratorWithMetadata}, by extending
+ * {@link org.hyperledger.fabric.shim.ledger.QueryResultsIterator} implementations, {@link QueryResultsIteratorImpl}
  *
  * @param 
  */
-public final class QueryResultsIteratorWithMetadataImpl extends QueryResultsIteratorImpl implements QueryResultsIteratorWithMetadata {
+public final class QueryResultsIteratorWithMetadataImpl extends QueryResultsIteratorImpl
+        implements QueryResultsIteratorWithMetadata {
     private static Logger logger = Logger.getLogger(QueryResultsIteratorWithMetadataImpl.class.getName());
 
     private QueryResponseMetadata metadata;
 
     /**
-     *
      * @param handler
      * @param channelId
      * @param txId
      * @param responseBuffer
      * @param mapper
      */
-    public QueryResultsIteratorWithMetadataImpl(final ChaincodeInvocationTask handler, final String channelId, final String txId,
-            final ByteString responseBuffer, final Function mapper) {
+    public QueryResultsIteratorWithMetadataImpl(
+            final ChaincodeInvocationTask handler,
+            final String channelId,
+            final String txId,
+            final ByteString responseBuffer,
+            final Function mapper) {
         super(handler, channelId, txId, responseBuffer, mapper);
         try {
             final QueryResponse queryResponse = QueryResponse.parseFrom(responseBuffer);
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/package-info.java
index ee6912ed..1147f629 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/package-info.java
@@ -4,7 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- *
- */
+/** */
 package org.hyperledger.fabric.shim.impl;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ledger/CompositeKey.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ledger/CompositeKey.java
index 8b47b39e..32335315 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ledger/CompositeKey.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ledger/CompositeKey.java
@@ -21,9 +21,7 @@ public class CompositeKey {
     private static final String INVALID_SEGMENT_CHAR = new String(Character.toChars(Character.MAX_CODE_POINT));
     private static final String INVALID_SEGMENT_PATTERN = String.format("(?:%s|%s)", INVALID_SEGMENT_CHAR, DELIMITER);
 
-    /**
-    *
-    */
+    /** */
     public static final String NAMESPACE = DELIMITER;
 
     private final String objectType;
@@ -31,7 +29,6 @@ public class CompositeKey {
     private final String compositeKey;
 
     /**
-     *
      * @param objectType
      * @param attributes
      */
@@ -40,7 +37,6 @@ public CompositeKey(final String objectType, final String... attributes) {
     }
 
     /**
-     *
      * @param objectType
      * @param attributes
      */
@@ -53,32 +49,23 @@ public CompositeKey(final String objectType, final List attributes) {
         this.compositeKey = generateCompositeKeyString(objectType, attributes);
     }
 
-    /**
-     *
-     * @return object type
-     */
+    /** @return object type */
     public String getObjectType() {
         return objectType;
     }
 
-    /**
-     *
-     * @return List of string arguments
-     */
+    /** @return List of string arguments */
     public List getAttributes() {
         return attributes;
     }
 
-    /**
-     *
-     */
+    /** */
     @Override
     public String toString() {
         return compositeKey;
     }
 
     /**
-     *
      * @param compositeKey
      * @return Composite Key
      */
@@ -95,9 +82,8 @@ public static CompositeKey parseCompositeKey(final String compositeKey) {
     }
 
     /**
-     * To ensure that simple keys do not go into composite key namespace, we
-     * validate simple key to check whether the key starts with 0x00 (which is the
-     * namespace for compositeKey). This helps in avoiding simple/composite key
+     * To ensure that simple keys do not go into composite key namespace, we validate simple key to check whether the
+     * key starts with 0x00 (which is the namespace for compositeKey). This helps in avoiding simple/composite key
      * collisions.
      *
      * @param keys the list of simple keys
@@ -124,7 +110,6 @@ private String generateCompositeKeyString(final String objectType, final List the type of elements returned by the iterator
  */
-public interface QueryResultsIterator extends Iterable, AutoCloseable {
-}
-
+public interface QueryResultsIterator extends Iterable, AutoCloseable {}
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ledger/QueryResultsIteratorWithMetadata.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ledger/QueryResultsIteratorWithMetadata.java
index 80081c91..b5c45cfa 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ledger/QueryResultsIteratorWithMetadata.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ledger/QueryResultsIteratorWithMetadata.java
@@ -9,18 +9,13 @@
 import org.hyperledger.fabric.protos.peer.QueryResponseMetadata;
 
 /**
- * QueryResultsIteratorWithMetadata allows a chaincode to iterate over a set of
- * key/value pairs returned by range, execute and history queries. In addition,
- * it store
- * {@link org.hyperledger.fabric.protos.peer.QueryResponseMetadata},
+ * QueryResultsIteratorWithMetadata allows a chaincode to iterate over a set of key/value pairs returned by range,
+ * execute and history queries. In addition, it store {@link org.hyperledger.fabric.protos.peer.QueryResponseMetadata},
  * returned by pagination range queries
  *
  * @param  the type of elements returned by the iterator
  */
 public interface QueryResultsIteratorWithMetadata extends Iterable, AutoCloseable {
-    /**
-     *
-     * @return Query Metadata
-     */
+    /** @return Query Metadata */
     QueryResponseMetadata getMetadata();
 }
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ledger/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ledger/package-info.java
index ed1ee601..e47b1e4a 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ledger/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ledger/package-info.java
@@ -10,4 +10,3 @@
  * @see org.hyperledger.fabric.shim.ChaincodeStub
  */
 package org.hyperledger.fabric.shim.ledger;
-
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/package-info.java
index 8ea4e804..2fd3f337 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/package-info.java
@@ -7,11 +7,11 @@
 /**
  * Provides interfaces and classes required for chaincode development and state variable access.
  *
- * 

- * It is possible to implement Java chaincode by extending the {@link org.hyperledger.fabric.shim.ChaincodeBase} class however new projects should should implement {@link org.hyperledger.fabric.contract.ContractInterface} and use the contract programming model instead.
+ * 
It is possible to implement Java chaincode by extending the {@link org.hyperledger.fabric.shim.ChaincodeBase}
+ * class however new projects should should implement {@link org.hyperledger.fabric.contract.ContractInterface} and use
+ * the contract programming model instead.
  *
  * @see org.hyperledger.fabric.contract
  * @see org.hyperledger.fabric.shim.ChaincodeBase
  */
 package org.hyperledger.fabric.shim;
-
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/Traces.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/Traces.java
index 2986f169..28ba7b28 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/Traces.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/Traces.java
@@ -5,19 +5,18 @@
  */
 package org.hyperledger.fabric.traces;
 
-import org.hyperledger.fabric.traces.impl.DefaultTracesProvider;
-import org.hyperledger.fabric.traces.impl.NullProvider;
-
 import java.lang.reflect.InvocationTargetException;
 import java.util.Properties;
 import java.util.logging.Logger;
+import org.hyperledger.fabric.traces.impl.DefaultTracesProvider;
+import org.hyperledger.fabric.traces.impl.NullProvider;
 
 /**
  * Traces Interface.
  *
- * Traces setups up the provider in use from the configuration supplied
+ * 
Traces setups up the provider in use from the configuration supplied
  *
- * If not enabled, nothing happens.
+ * 
If not enabled, nothing happens.
  */
 public final class Traces {
 
@@ -28,13 +27,9 @@ public final class Traces {
 
     private static TracesProvider provider;
 
-
-    private Traces() {
-
-    }
+    private Traces() {}
 
     /**
-     *
      * @param props the configuration of the chaincode
      * @return The traces provider
      */
@@ -46,32 +41,32 @@ public static TracesProvider initialize(final Properties props) {
                     final String providerClass = (String) props.get(CHAINCODE_TRACES_PROVIDER);
 
                     @SuppressWarnings("unchecked") // it must be this type otherwise an error
-                    final
-                    Class clazz = (Class) Class.forName(providerClass);
+                    final Class clazz = (Class) Class.forName(providerClass);
                     provider = clazz.getConstructor().newInstance();
                 } else {
                     logger.info("Using default traces provider");
                     provider = new DefaultTracesProvider();
                 }
-            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
-                    | NoSuchMethodException | SecurityException e) {
+            } catch (ClassNotFoundException
+                    | InstantiationException
+                    | IllegalAccessException
+                    | IllegalArgumentException
+                    | InvocationTargetException
+                    | NoSuchMethodException
+                    | SecurityException e) {
                 throw new RuntimeException("Unable to start traces", e);
             }
         } else {
             // return a 'null' provider
             logger.info("Traces disabled");
             provider = new NullProvider();
-
         }
 
         provider.initialize(props);
         return provider;
     }
 
-    /**
-     *
-     * @return TracesProvider
-     */
+    /** @return TracesProvider */
     public static TracesProvider getProvider() {
         if (provider == null) {
             throw new IllegalStateException("No provider set, this should have been set");
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/TracesProvider.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/TracesProvider.java
index 16712059..2083b4e9 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/TracesProvider.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/TracesProvider.java
@@ -8,25 +8,20 @@
 
 import io.grpc.ClientInterceptor;
 import io.opentelemetry.api.trace.Span;
-import org.hyperledger.fabric.shim.ChaincodeStub;
-
 import java.util.Properties;
+import org.hyperledger.fabric.shim.ChaincodeStub;
 
 /**
- * Interface to be implemented to send traces on the chaincode to the
- * 'backend-of-choice'.
+ * Interface to be implemented to send traces on the chaincode to the 'backend-of-choice'.
  *
- * An instance of this will be created, and provided with the resources from
- * which chaincode specific metrics can be collected. (via the no-argument
- * constructor).
+ * 
An instance of this will be created, and provided with the resources from which chaincode specific metrics can be
+ * collected. (via the no-argument constructor).
  *
- * The choice of when, where and what to collect etc are within the remit of the
- * provider.
+ * 
The choice of when, where and what to collect etc are within the remit of the provider.
  *
- * This is the effective call sequence.
+ * 
This is the effective call sequence.
  *
- * MyTracesProvider mmp = new MyTracesProvider()
- * mmp.initialize(props_from_environment); // short while later....
+ * 
MyTracesProvider mmp = new MyTracesProvider() mmp.initialize(props_from_environment); // short while later....
  * mmp.setTaskTracesCollector(taskService);
  */
 public interface TracesProvider {
@@ -36,22 +31,23 @@ public interface TracesProvider {
      *
      * @param props
      */
-    default void initialize(final Properties props) {
-    };
+    default void initialize(final Properties props) {}
+    ;
 
     /**
      * Creates a span with metadata of the current chaincode execution, possibly linked to the execution arguments.
+     *
      * @param stub the context of the chaincode execution
-     * @return a new span if traces are enabled, or null.
-     * The caller is responsible for closing explicitly the span.
+     * @return a new span if traces are enabled, or null. The caller is responsible for closing explicitly the span.
      */
     default Span createSpan(ChaincodeStub stub) {
         return null;
     }
 
     /**
-     * Creates an interceptor of gRPC messages that can be injected in processing incoming messages to extract
-     * trace information.
+     * Creates an interceptor of gRPC messages that can be injected in processing incoming messages to extract trace
+     * information.
+     *
      * @return a new client interceptor, or null if no interceptor is set.
      */
     default ClientInterceptor createInterceptor() {
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/DefaultTracesProvider.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/DefaultTracesProvider.java
index 1ea5b982..0153cc9c 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/DefaultTracesProvider.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/DefaultTracesProvider.java
@@ -7,5 +7,4 @@
 
 import org.hyperledger.fabric.traces.TracesProvider;
 
-public final class DefaultTracesProvider implements TracesProvider {
-}
+public final class DefaultTracesProvider implements TracesProvider {}
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/NullProvider.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/NullProvider.java
index 15818d5e..fa851edd 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/NullProvider.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/NullProvider.java
@@ -7,5 +7,4 @@
 
 import org.hyperledger.fabric.traces.TracesProvider;
 
-public final class NullProvider implements TracesProvider {
-}
+public final class NullProvider implements TracesProvider {}
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/OpenTelemetryProperties.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/OpenTelemetryProperties.java
index 38c0fb72..7afa5c48 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/OpenTelemetryProperties.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/OpenTelemetryProperties.java
@@ -7,8 +7,6 @@
 
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
-
-import javax.annotation.Nullable;
 import java.time.Duration;
 import java.util.AbstractMap;
 import java.util.Arrays;
@@ -20,6 +18,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 
 final class OpenTelemetryProperties implements ConfigProperties {
     private final Map config;
@@ -34,14 +33,12 @@ final class OpenTelemetryProperties implements ConfigProperties {
     }
 
     @Override
-    @Nullable
-    public String getString(final String name) {
+    @Nullable public String getString(final String name) {
         return config.get(name);
     }
 
     @Override
-    @Nullable
-    public Boolean getBoolean(final String name) {
+    @Nullable public Boolean getBoolean(final String name) {
         String value = config.get(name);
         if (value == null || value.isEmpty()) {
             return null;
@@ -50,8 +47,7 @@ public Boolean getBoolean(final String name) {
     }
 
     @Override
-    @Nullable
-    @SuppressWarnings("UnusedException")
+    @Nullable @SuppressWarnings("UnusedException")
     public Integer getInt(final String name) {
         String value = config.get(name);
         if (value == null || value.isEmpty()) {
@@ -65,8 +61,7 @@ public Integer getInt(final String name) {
     }
 
     @Override
-    @Nullable
-    @SuppressWarnings("UnusedException")
+    @Nullable @SuppressWarnings("UnusedException")
     public Long getLong(final String name) {
         String value = config.get(name);
         if (value == null || value.isEmpty()) {
@@ -80,8 +75,7 @@ public Long getLong(final String name) {
     }
 
     @Override
-    @Nullable
-    @SuppressWarnings("UnusedException")
+    @Nullable @SuppressWarnings("UnusedException")
     public Double getDouble(final String name) {
         String value = config.get(name);
         if (value == null || value.isEmpty()) {
@@ -95,8 +89,7 @@ public Double getDouble(final String name) {
     }
 
     @Override
-    @Nullable
-    @SuppressWarnings("UnusedException")
+    @Nullable @SuppressWarnings("UnusedException")
     public Duration getDuration(final String name) {
         String value = config.get(name);
         if (value == null || value.isEmpty()) {
@@ -110,12 +103,7 @@ public Duration getDuration(final String name) {
             return Duration.ofMillis(TimeUnit.MILLISECONDS.convert(rawNumber, unit));
         } catch (NumberFormatException ex) {
             throw new ConfigurationException(
-                    "Invalid duration property "
-                            + name
-                            + "="
-                            + value
-                            + ". Expected number, found: "
-                            + numberString);
+                    "Invalid duration property " + name + "=" + value + ". Expected number, found: " + numberString);
         } catch (ConfigurationException ex) {
             throw new ConfigurationException(
                     "Invalid duration property " + name + "=" + value + ". " + ex.getMessage());
@@ -135,20 +123,16 @@ public List getList(final String name) {
     public Map getMap(final String name) {
         return getList(name).stream()
                 .map(keyValuePair -> filterBlanksAndNulls(keyValuePair.split("=", 2)))
-                .map(
-                        splitKeyValuePairs -> {
-                            if (splitKeyValuePairs.size() != 2) {
-                                throw new ConfigurationException(
-                                        "Invalid map property: " + name + "=" + config.get(name));
-                            }
-                            return new AbstractMap.SimpleImmutableEntry<>(
-                                    splitKeyValuePairs.get(0), splitKeyValuePairs.get(1));
-                        })
+                .map(splitKeyValuePairs -> {
+                    if (splitKeyValuePairs.size() != 2) {
+                        throw new ConfigurationException("Invalid map property: " + name + "=" + config.get(name));
+                    }
+                    return new AbstractMap.SimpleImmutableEntry<>(splitKeyValuePairs.get(0), splitKeyValuePairs.get(1));
+                })
                 // If duplicate keys, prioritize later ones similar to duplicate system properties on a
                 // Java command line.
-                .collect(
-                        Collectors.toMap(
-                                Map.Entry::getKey, Map.Entry::getValue, (first, next) -> next, LinkedHashMap::new));
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey, Map.Entry::getValue, (first, next) -> next, LinkedHashMap::new));
     }
 
     private static ConfigurationException newInvalidPropertyException(
@@ -158,14 +142,12 @@ private static ConfigurationException newInvalidPropertyException(
     }
 
     private static List filterBlanksAndNulls(final String[] values) {
-        return Arrays.stream(values)
-                .map(String::trim)
-                .filter(s -> !s.isEmpty())
-                .collect(Collectors.toList());
+        return Arrays.stream(values).map(String::trim).filter(s -> !s.isEmpty()).collect(Collectors.toList());
     }
 
     /**
      * Returns the TimeUnit associated with a unit string. Defaults to milliseconds.
+     *
      * @param unitString the time unit as a string
      * @return the parsed TimeUnit
      */
@@ -191,6 +173,7 @@ private static TimeUnit getDurationUnit(final String unitString) {
      * Fragments the 'units' portion of a config value from the 'value' portion.
      *
      * 
E.g. "1ms" would return the string "ms".
+     *
      * @param rawValue the raw value of a unit and value
      * @return the unit string
      */
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/OpenTelemetryTracesProvider.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/OpenTelemetryTracesProvider.java
index 696aecec..4801ebe3 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/OpenTelemetryTracesProvider.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/OpenTelemetryTracesProvider.java
@@ -13,14 +13,12 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.grpc.v1_6.GrpcTelemetry;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
-import io.opentelemetry.semconv.ResourceAttributes;
-
-import org.hyperledger.fabric.shim.ChaincodeStub;
-import org.hyperledger.fabric.traces.TracesProvider;
-
+import io.opentelemetry.semconv.ServiceAttributes;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+import org.hyperledger.fabric.shim.ChaincodeStub;
+import org.hyperledger.fabric.traces.TracesProvider;
 
 public final class OpenTelemetryTracesProvider implements TracesProvider {
 
@@ -34,7 +32,7 @@ public final class OpenTelemetryTracesProvider implements TracesProvider {
     @Override
     public void initialize(final Properties props) {
         String serviceName = props.getProperty(CORE_CHAINCODE_ID_NAME, "unknown");
-        props.setProperty(ResourceAttributes.SERVICE_NAME.getKey(), serviceName);
+        props.setProperty(ServiceAttributes.SERVICE_NAME.getKey(), serviceName);
 
         OpenTelemetry openTelemetry = AutoConfiguredOpenTelemetrySdk.builder()
                 .addPropertiesSupplier(() -> getOpenTelemetryProperties(props))
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/package-info.java
index b8aef10b..dd29ef78 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/impl/package-info.java
@@ -1,6 +1,6 @@
-/*
- * Copyright 2023 IBM All Rights Reserved.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.fabric.traces.impl;
+/*
+ * Copyright 2023 IBM All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.fabric.traces.impl;
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/package-info.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/package-info.java
index 07ffd3ee..147b5795 100644
--- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/package-info.java
+++ b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/traces/package-info.java
@@ -5,15 +5,12 @@
  */
 
 /**
- * 

  * Supports collection of traces
- * 

- * This creates traces at the root level of chaincode calls.
  *
+ * 
This creates traces at the root level of chaincode calls.
  *
- * To enable traces ensure that there is a standard format Java properties file
- * called `config.props` in the root of your contract code. For example this
- * path
+ * 
To enable traces ensure that there is a standard format Java properties file called `config.props` in the root of
+ * your contract code. For example this path
  *
  * 
  * myjava - contract - project / java / src / main / resources / config.props
@@ -25,15 +22,11 @@
  * CHAINCODE_TRACES_ENABLED=true
  * 

  *
- * The traces enabled flag will turn on default traces logging. (it's off by
- * default).
+ * The traces enabled flag will turn on default traces logging. (it's off by default).
  *
- * If no file is supplied traces are not enabled, the values shown for the
- * thread pool are used.
+ * 
If no file is supplied traces are not enabled, the values shown for the thread pool are used.
  *
- * 
Open Telemetry

- *
- * To use Open Telemetry, set the following properties:
+ * 
Open Telemetry To use Open Telemetry, set the following properties:
  *
  * 
  * CHAINCODE_TRACES_ENABLED=true
@@ -43,7 +36,8 @@
  * Additionally, you can set properties after the specification:
  * https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/sdk-environment-variables.md
  *
- * Example:
+ * 
Example:
+ *
  * 
  * OTEL_EXPORTER_OTLP_ENDPOINT=otelcollector:4317
  * OTEL_EXPORTER_OTLP_INSECURE=true
diff --git a/fabric-chaincode-shim/src/test/java/ChaincodeWithoutPackageTest.java b/fabric-chaincode-shim/src/test/java/ChaincodeWithoutPackageTest.java
index f62b044c..a97b3071 100644
--- a/fabric-chaincode-shim/src/test/java/ChaincodeWithoutPackageTest.java
+++ b/fabric-chaincode-shim/src/test/java/ChaincodeWithoutPackageTest.java
@@ -4,6 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.READY;
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.REGISTER;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 import org.hyperledger.fabric.shim.ChaincodeBase;
 import org.hyperledger.fabric.shim.mock.peer.ChaincodeMockPeer;
 import org.hyperledger.fabric.shim.mock.peer.RegisterStep;
@@ -11,14 +18,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.READY;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.REGISTER;
-
 public final class ChaincodeWithoutPackageTest {
     private ChaincodeMockPeer server;
 
@@ -39,12 +38,11 @@ public void testRegisterChaincodeWithoutPackage() throws Exception {
 
         server = ChaincodeMockPeer.startServer(scenario);
 
-        cb.start(new String[]{"-a", "127.0.0.1:7052", "-i", "testId"});
+        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
 
         ChaincodeMockPeer.checkScenarioStepEnded(server, 1, 5000, TimeUnit.MILLISECONDS);
 
         assertThat(server.getLastMessageSend().getType()).isEqualTo(READY);
         assertThat(server.getLastMessageRcvd().getType()).isEqualTo(REGISTER);
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/contract/Greeting.java b/fabric-chaincode-shim/src/test/java/contract/Greeting.java
index b2c3bc7f..7f2a16f5 100644
--- a/fabric-chaincode-shim/src/test/java/contract/Greeting.java
+++ b/fabric-chaincode-shim/src/test/java/contract/Greeting.java
@@ -60,11 +60,9 @@ public static void validate(final Greeting greeting) {
         if (text.split(" ").length != greeting.wordCount) {
             throw new Error("Word count incorrectly set");
         }
-
     }
 
     public String toJSONString() {
         return new JSONObject(this).toString();
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/contract/SampleContract.java b/fabric-chaincode-shim/src/test/java/contract/SampleContract.java
index c10b4154..a28a2924 100644
--- a/fabric-chaincode-shim/src/test/java/contract/SampleContract.java
+++ b/fabric-chaincode-shim/src/test/java/contract/SampleContract.java
@@ -6,7 +6,6 @@
 package contract;
 
 import java.util.List;
-
 import org.hyperledger.fabric.contract.Context;
 import org.hyperledger.fabric.contract.ContractInterface;
 import org.hyperledger.fabric.contract.annotation.Contact;
@@ -19,14 +18,12 @@
 
 @Contract(
         name = "samplecontract",
-        info = @Info(
-                contact = @Contact(
-                        email = "fred@example.com"),
-                license = @License(
-                        name = "fred",
-                        url = "http://fred.me"),
-                version = "0.0.1",
-                title = "samplecontract"))
+        info =
+                @Info(
+                        contact = @Contact(email = "fred@example.com"),
+                        license = @License(name = "fred", url = "http://fred.me"),
+                        version = "0.0.1",
+                        title = "samplecontract"))
 @Default()
 public class SampleContract implements ContractInterface {
     public static int getBeforeInvoked() {
@@ -127,9 +124,7 @@ public String t2(final Context ctx) {
         return "Transaction 2";
     }
 
-    /**
-     * @param ctx
-     */
+    /** @param ctx */
     @Transaction
     public void noReturn(final Context ctx) {
         System.out.println("SampleContract::noReturn done");
@@ -150,17 +145,13 @@ public String t1(final Context ctx, final String arg1) {
         return args.get(1);
     }
 
-    /**
-     *
-     */
+    /** */
     @Override
     public void beforeTransaction(final Context ctx) {
         beforeInvoked++;
     }
 
-    /**
-     *
-     */
+    /** */
     @Override
     public void afterTransaction(final Context ctx, final Object value) {
         afterInvoked++;
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/LoggerTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/LoggerTest.java
index cd99c74c..62751cef 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/LoggerTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/LoggerTest.java
@@ -29,7 +29,6 @@ public void testContractException() {
 
         logger.error("all gone wrong");
         logger.error(() -> "all gone wrong");
-
     }
 
     @Test
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/LoggingTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/LoggingTest.java
index 6c69de43..c4b22d47 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/LoggingTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/LoggingTest.java
@@ -5,16 +5,15 @@
  */
 package org.hyperledger.fabric;
 
-import org.hamcrest.CoreMatchers;
-import org.junit.jupiter.api.Test;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.Test;
 
 public final class LoggingTest {
     @Test
@@ -37,11 +36,13 @@ public Object proxyMapLevel(final Object... args) {
             final Method m = Logging.class.getDeclaredMethod("mapLevel", String.class);
             m.setAccessible(true);
             return m.invoke(null, args);
-        } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException
+        } catch (NoSuchMethodException
+                | SecurityException
+                | IllegalAccessException
+                | IllegalArgumentException
                 | InvocationTargetException e) {
             throw new RuntimeException(e);
         }
-
     }
 
     @Test
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/TestUtil.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/TestUtil.java
index ee448f66..8c48b8b5 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/TestUtil.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/TestUtil.java
@@ -12,7 +12,6 @@
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Base64;
-
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.cert.X509CertificateHolder;
 import org.bouncycastle.cert.X509v3CertificateBuilder;
@@ -21,47 +20,66 @@
 
 public final class TestUtil {
 
-    private TestUtil() {
-
-    }
+    private TestUtil() {}
 
     public static final String CERT_WITHOUT_ATTRS = "MIICXTCCAgSgAwIBAgIUeLy6uQnq8wwyElU/jCKRYz3tJiQwCgYIKoZIzj0EAwIw"
-            + "eTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh" + "biBGcmFuY2lzY28xGTAXBgNVBAoTEEludGVybmV0IFdpZGdldHMxDDAKBgNVBAsT"
-            + "A1dXVzEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTcwOTA4MDAxNTAwWhcNMTgw" + "OTA4MDAxNTAwWjBdMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xp"
-            + "bmExFDASBgNVBAoTC0h5cGVybGVkZ2VyMQ8wDQYDVQQLEwZGYWJyaWMxDjAMBgNV" + "BAMTBWFkbWluMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEFq/90YMuH4tWugHa"
-            + "oyZtt4Mbwgv6CkBSDfYulVO1CVInw1i/k16DocQ/KSDTeTfgJxrX1Ree1tjpaodG" + "1wWyM6OBhTCBgjAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADAdBgNVHQ4E"
-            + "FgQUhKs/VJ9IWJd+wer6sgsgtZmxZNwwHwYDVR0jBBgwFoAUIUd4i/sLTwYWvpVr" + "TApzcT8zv/kwIgYDVR0RBBswGYIXQW5pbHMtTWFjQm9vay1Qcm8ubG9jYWwwCgYI"
-            + "KoZIzj0EAwIDRwAwRAIgCoXaCdU8ZiRKkai0QiXJM/GL5fysLnmG2oZ6XOIdwtsC" + "IEmCsI8Mhrvx1doTbEOm7kmIrhQwUVDBNXCWX1t3kJVN";
+            + "eTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh"
+            + "biBGcmFuY2lzY28xGTAXBgNVBAoTEEludGVybmV0IFdpZGdldHMxDDAKBgNVBAsT"
+            + "A1dXVzEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTcwOTA4MDAxNTAwWhcNMTgw"
+            + "OTA4MDAxNTAwWjBdMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xp"
+            + "bmExFDASBgNVBAoTC0h5cGVybGVkZ2VyMQ8wDQYDVQQLEwZGYWJyaWMxDjAMBgNV"
+            + "BAMTBWFkbWluMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEFq/90YMuH4tWugHa"
+            + "oyZtt4Mbwgv6CkBSDfYulVO1CVInw1i/k16DocQ/KSDTeTfgJxrX1Ree1tjpaodG"
+            + "1wWyM6OBhTCBgjAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADAdBgNVHQ4E"
+            + "FgQUhKs/VJ9IWJd+wer6sgsgtZmxZNwwHwYDVR0jBBgwFoAUIUd4i/sLTwYWvpVr"
+            + "TApzcT8zv/kwIgYDVR0RBBswGYIXQW5pbHMtTWFjQm9vay1Qcm8ubG9jYWwwCgYI"
+            + "KoZIzj0EAwIDRwAwRAIgCoXaCdU8ZiRKkai0QiXJM/GL5fysLnmG2oZ6XOIdwtsC"
+            + "IEmCsI8Mhrvx1doTbEOm7kmIrhQwUVDBNXCWX1t3kJVN";
 
     public static final String CERT_WITH_ATTRS = "MIIB6TCCAY+gAwIBAgIUHkmY6fRP0ANTvzaBwKCkMZZPUnUwCgYIKoZIzj0EAwIw"
-            + "GzEZMBcGA1UEAxMQZmFicmljLWNhLXNlcnZlcjAeFw0xNzA5MDgwMzQyMDBaFw0x" + "ODA5MDgwMzQyMDBaMB4xHDAaBgNVBAMTE015VGVzdFVzZXJXaXRoQXR0cnMwWTAT"
-            + "BgcqhkjOPQIBBggqhkjOPQMBBwNCAATmB1r3CdWvOOP3opB3DjJnW3CnN8q1ydiR" + "dzmuA6A2rXKzPIltHvYbbSqISZJubsy8gVL6GYgYXNdu69RzzFF5o4GtMIGqMA4G"
-            + "A1UdDwEB/wQEAwICBDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTYKLTAvJJK08OM" + "VGwIhjMQpo2DrjAfBgNVHSMEGDAWgBTEs/52DeLePPx1+65VhgTwu3/2ATAiBgNV"
-            + "HREEGzAZghdBbmlscy1NYWNCb29rLVByby5sb2NhbDAmBggqAwQFBgcIAQQaeyJh" + "dHRycyI6eyJhdHRyMSI6InZhbDEifX0wCgYIKoZIzj0EAwIDSAAwRQIhAPuEqWUp"
+            + "GzEZMBcGA1UEAxMQZmFicmljLWNhLXNlcnZlcjAeFw0xNzA5MDgwMzQyMDBaFw0x"
+            + "ODA5MDgwMzQyMDBaMB4xHDAaBgNVBAMTE015VGVzdFVzZXJXaXRoQXR0cnMwWTAT"
+            + "BgcqhkjOPQIBBggqhkjOPQMBBwNCAATmB1r3CdWvOOP3opB3DjJnW3CnN8q1ydiR"
+            + "dzmuA6A2rXKzPIltHvYbbSqISZJubsy8gVL6GYgYXNdu69RzzFF5o4GtMIGqMA4G"
+            + "A1UdDwEB/wQEAwICBDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTYKLTAvJJK08OM"
+            + "VGwIhjMQpo2DrjAfBgNVHSMEGDAWgBTEs/52DeLePPx1+65VhgTwu3/2ATAiBgNV"
+            + "HREEGzAZghdBbmlscy1NYWNCb29rLVByby5sb2NhbDAmBggqAwQFBgcIAQQaeyJh"
+            + "dHRycyI6eyJhdHRyMSI6InZhbDEifX0wCgYIKoZIzj0EAwIDSAAwRQIhAPuEqWUp"
             + "svTTvBqLR5JeQSctJuz3zaqGRqSs2iW+QB3FAiAIP0mGWKcgSGRMMBvaqaLytBYo" + "9v3hRt1r8j8vN0pMcg==";
 
     public static final String CERT_WITH_DNS = "MIICGjCCAcCgAwIBAgIRAIPRwJHVLhHK47XK0BbFZJswCgYIKoZIzj0EAwIwczEL"
-            + "MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG" + "cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh"
-            + "Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTcwNjIzMTIzMzE5WhcNMjcwNjIxMTIzMzE5" + "WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN"
-            + "U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWVXNlcjFAb3JnMi5leGFtcGxlLmNvbTBZ" + "MBMGByqGSM49AgEGCCqGSM49AwEHA0IABBd9SsEiFH1/JIb3qMEPLR2dygokFVKW"
-            + "eINcB0Ni4TBRkfIWWUJeCANTUY11Pm/+5gs+fBTqBz8M2UzpJDVX7+2jTTBLMA4G" + "A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIKfUfvpGproH"
-            + "cwyFD+0sE3XfJzYNcif0jNwvgOUFZ4AFMAoGCCqGSM49BAMCA0gAMEUCIQC8NIMw" + "e4ym/QRwCJb5umbONNLSVQuEpnPsJrM/ssBPvgIgQpe2oYa3yO3USro9nBHjpM3L"
+            + "MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG"
+            + "cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh"
+            + "Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTcwNjIzMTIzMzE5WhcNMjcwNjIxMTIzMzE5"
+            + "WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN"
+            + "U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWVXNlcjFAb3JnMi5leGFtcGxlLmNvbTBZ"
+            + "MBMGByqGSM49AgEGCCqGSM49AwEHA0IABBd9SsEiFH1/JIb3qMEPLR2dygokFVKW"
+            + "eINcB0Ni4TBRkfIWWUJeCANTUY11Pm/+5gs+fBTqBz8M2UzpJDVX7+2jTTBLMA4G"
+            + "A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIKfUfvpGproH"
+            + "cwyFD+0sE3XfJzYNcif0jNwvgOUFZ4AFMAoGCCqGSM49BAMCA0gAMEUCIQC8NIMw"
+            + "e4ym/QRwCJb5umbONNLSVQuEpnPsJrM/ssBPvgIgQpe2oYa3yO3USro9nBHjpM3L"
             + "KsFQrpVnF8O6hoHOYZQ=";
 
-    public static final String CERT_MULTIPLE_ATTRIBUTES = "MIIChzCCAi6gAwIBAgIURilAHeqwLu/fNUv8eZoGPRh3H4IwCgYIKoZIzj0EAwIw"
-            + "czELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh" + "biBGcmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMT"
-            + "E2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNzMxMTYxNzAwWhcNMjAwNzMwMTYy" + "MjAwWjAgMQ8wDQYDVQQLEwZjbGllbnQxDTALBgNVBAMTBHRlc3QwWTATBgcqhkjO"
-            + "PQIBBggqhkjOPQMBBwNCAAR2taQK8w7D3hr3gBxCz+8eV4KSv7pFQfNjDHMMe9J9" + "LJwcLpVTT5hYiLLRaqQonLBxBE3Ey0FneySvFuBScas3o4HyMIHvMA4GA1UdDwEB"
-            + "/wQEAwIHgDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQi3mhXS/WzcjBniwAmPdYP" + "kHqVVzArBgNVHSMEJDAigCC7VXjmSEugjAB/A0S6vfMxLsUIgag9WVNwtwwebnRC"
-            + "7TCBggYIKgMEBQYHCAEEdnsiYXR0cnMiOnsiYXR0cjEiOiJ2YWwxIiwiZm9vIjoi" + "YmFyIiwiaGVsbG8iOiJ3b3JsZCIsImhmLkFmZmlsaWF0aW9uIjoiIiwiaGYuRW5y"
-            + "b2xsbWVudElEIjoidGVzdCIsImhmLlR5cGUiOiJjbGllbnQifX0wCgYIKoZIzj0E" + "AwIDRwAwRAIgQxEFvnZTEsf3CSZmp9IYsxcnEOtVYleOd86LAKtk1wICIH7XOPwW"
-            + "/RE4Z8WLZzFei/78Oezbx6obOvBxPMsVWRe5";
+    public static final String CERT_MULTIPLE_ATTRIBUTES =
+            "MIIChzCCAi6gAwIBAgIURilAHeqwLu/fNUv8eZoGPRh3H4IwCgYIKoZIzj0EAwIw"
+                    + "czELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh"
+                    + "biBGcmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMT"
+                    + "E2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNzMxMTYxNzAwWhcNMjAwNzMwMTYy"
+                    + "MjAwWjAgMQ8wDQYDVQQLEwZjbGllbnQxDTALBgNVBAMTBHRlc3QwWTATBgcqhkjO"
+                    + "PQIBBggqhkjOPQMBBwNCAAR2taQK8w7D3hr3gBxCz+8eV4KSv7pFQfNjDHMMe9J9"
+                    + "LJwcLpVTT5hYiLLRaqQonLBxBE3Ey0FneySvFuBScas3o4HyMIHvMA4GA1UdDwEB"
+                    + "/wQEAwIHgDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQi3mhXS/WzcjBniwAmPdYP"
+                    + "kHqVVzArBgNVHSMEJDAigCC7VXjmSEugjAB/A0S6vfMxLsUIgag9WVNwtwwebnRC"
+                    + "7TCBggYIKgMEBQYHCAEEdnsiYXR0cnMiOnsiYXR0cjEiOiJ2YWwxIiwiZm9vIjoi"
+                    + "YmFyIiwiaGVsbG8iOiJ3b3JsZCIsImhmLkFmZmlsaWF0aW9uIjoiIiwiaGYuRW5y"
+                    + "b2xsbWVudElEIjoidGVzdCIsImhmLlR5cGUiOiJjbGllbnQifX0wCgYIKoZIzj0E"
+                    + "AwIDRwAwRAIgQxEFvnZTEsf3CSZmp9IYsxcnEOtVYleOd86LAKtk1wICIH7XOPwW"
+                    + "/RE4Z8WLZzFei/78Oezbx6obOvBxPMsVWRe5";
 
     /**
      * Function to create a certificate with dummy attributes
      *
-     * @param attributeValue {String} value to be written to the identity attributes
-     *                       section of the certificate
+     * @param attributeValue {String} value to be written to the identity attributes section of the certificate
      * @return encodedCert {String} encoded certificate with re-written attributes
      */
     public static String createCertWithIdentityAttributes(final String attributeValue) throws Exception {
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/AllTypesAsset.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/AllTypesAsset.java
index 6852d616..86cee5cf 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/AllTypesAsset.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/AllTypesAsset.java
@@ -27,7 +27,8 @@ public final class AllTypesAsset {
     private float theFloat = 3.1415926535_8979323846_2643383279_5028841971_6939937510_5820974944_5923078164f;
 
     @Property
-    private double theDouble = 3.1415926535_8979323846_2643383279_5028841971_6939937510_5820974944_5923078164_0628620899_8628034825_3421170679d;
+    private double theDouble =
+            3.1415926535_8979323846_2643383279_5028841971_6939937510_5820974944_5923078164_0628620899_8628034825_3421170679d;
 
     @Property
     private boolean theBoolean = false;
@@ -122,8 +123,14 @@ public void setTheCustomObject(final MyType customObject) {
     }
 
     public boolean equals(final AllTypesAsset obj) {
-        return theByte == obj.getTheByte() && theShort == obj.getTheShort() && theInt == obj.getTheInt() && theLong == obj.getTheLong()
-                && theFloat == obj.getTheFloat() && theDouble == obj.getTheDouble() && theBoolean == obj.isTheBoolean() && theString.equals(obj.getTheString());
+        return theByte == obj.getTheByte()
+                && theShort == obj.getTheShort()
+                && theInt == obj.getTheInt()
+                && theLong == obj.getTheLong()
+                && theFloat == obj.getTheFloat()
+                && theDouble == obj.getTheDouble()
+                && theBoolean == obj.isTheBoolean()
+                && theString.equals(obj.getTheString());
     }
 
     @Override
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ChaincodeStubNaiveImpl.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ChaincodeStubNaiveImpl.java
index dcd7c2ff..0054c1d6 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ChaincodeStubNaiveImpl.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ChaincodeStubNaiveImpl.java
@@ -5,6 +5,7 @@
  */
 package org.hyperledger.fabric.contract;
 
+import com.google.protobuf.ByteString;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -13,7 +14,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import org.hyperledger.fabric.TestUtil;
 import org.hyperledger.fabric.protos.msp.SerializedIdentity;
 import org.hyperledger.fabric.protos.peer.ChaincodeEvent;
@@ -26,8 +26,6 @@
 import org.hyperledger.fabric.shim.ledger.QueryResultsIterator;
 import org.hyperledger.fabric.shim.ledger.QueryResultsIteratorWithMetadata;
 
-import com.google.protobuf.ByteString;
-
 public final class ChaincodeStubNaiveImpl implements ChaincodeStub {
     private List args;
     private List argsAsByte;
@@ -93,7 +91,8 @@ public String getChannelId() {
     }
 
     @Override
-    public Chaincode.Response invokeChaincode(final String chaincodeName, final List args, final String channel) {
+    public Chaincode.Response invokeChaincode(
+            final String chaincodeName, final List args, final String channel) {
         return resp;
     }
 
@@ -110,13 +109,10 @@ public byte[] getStateValidationParameter(final String key) {
     @Override
     public void putState(final String key, final byte[] value) {
         state.put(key, ByteString.copyFrom(value));
-
     }
 
     @Override
-    public void setStateValidationParameter(final String key, final byte[] value) {
-
-    }
+    public void setStateValidationParameter(final String key, final byte[] value) {}
 
     @Override
     public void delState(final String key) {
@@ -129,8 +125,8 @@ public QueryResultsIterator getStateByRange(final String startKey, fin
     }
 
     @Override
-    public QueryResultsIteratorWithMetadata getStateByRangeWithPagination(final String startKey, final String endKey, final int pageSize,
-            final String bookmark) {
+    public QueryResultsIteratorWithMetadata getStateByRangeWithPagination(
+            final String startKey, final String endKey, final int pageSize, final String bookmark) {
         return null;
     }
 
@@ -140,7 +136,8 @@ public QueryResultsIterator getStateByPartialCompositeKey(final String
     }
 
     @Override
-    public QueryResultsIterator getStateByPartialCompositeKey(final String objectType, final String... attributes) {
+    public QueryResultsIterator getStateByPartialCompositeKey(
+            final String objectType, final String... attributes) {
         return null;
     }
 
@@ -150,8 +147,8 @@ public QueryResultsIterator getStateByPartialCompositeKey(final Compos
     }
 
     @Override
-    public QueryResultsIteratorWithMetadata getStateByPartialCompositeKeyWithPagination(final CompositeKey compositeKey, final int pageSize,
-            final String bookmark) {
+    public QueryResultsIteratorWithMetadata getStateByPartialCompositeKeyWithPagination(
+            final CompositeKey compositeKey, final int pageSize, final String bookmark) {
         return null;
     }
 
@@ -171,7 +168,8 @@ public QueryResultsIterator getQueryResult(final String query) {
     }
 
     @Override
-    public QueryResultsIteratorWithMetadata getQueryResultWithPagination(final String query, final int pageSize, final String bookmark) {
+    public QueryResultsIteratorWithMetadata getQueryResultWithPagination(
+            final String query, final int pageSize, final String bookmark) {
         return null;
     }
 
@@ -196,42 +194,38 @@ public byte[] getPrivateDataValidationParameter(final String collection, final S
     }
 
     @Override
-    public void putPrivateData(final String collection, final String key, final byte[] value) {
-
-    }
+    public void putPrivateData(final String collection, final String key, final byte[] value) {}
 
     @Override
-    public void setPrivateDataValidationParameter(final String collection, final String key, final byte[] value) {
-
-    }
+    public void setPrivateDataValidationParameter(final String collection, final String key, final byte[] value) {}
 
     @Override
-    public void delPrivateData(final String collection, final String key) {
-
-    }
+    public void delPrivateData(final String collection, final String key) {}
 
     @Override
-    public void purgePrivateData(final String collection, final String key) {
-
-    }
+    public void purgePrivateData(final String collection, final String key) {}
 
     @Override
-    public QueryResultsIterator getPrivateDataByRange(final String collection, final String startKey, final String endKey) {
+    public QueryResultsIterator getPrivateDataByRange(
+            final String collection, final String startKey, final String endKey) {
         return null;
     }
 
     @Override
-    public QueryResultsIterator getPrivateDataByPartialCompositeKey(final String collection, final String compositeKey) {
+    public QueryResultsIterator getPrivateDataByPartialCompositeKey(
+            final String collection, final String compositeKey) {
         return null;
     }
 
     @Override
-    public QueryResultsIterator getPrivateDataByPartialCompositeKey(final String collection, final CompositeKey compositeKey) {
+    public QueryResultsIterator getPrivateDataByPartialCompositeKey(
+            final String collection, final CompositeKey compositeKey) {
         return null;
     }
 
     @Override
-    public QueryResultsIterator getPrivateDataByPartialCompositeKey(final String collection, final String objectType, final String... attributes) {
+    public QueryResultsIterator getPrivateDataByPartialCompositeKey(
+            final String collection, final String objectType, final String... attributes) {
         return null;
     }
 
@@ -241,9 +235,7 @@ public QueryResultsIterator getPrivateDataQueryResult(final String col
     }
 
     @Override
-    public void setEvent(final String name, final byte[] payload) {
-
-    }
+    public void setEvent(final String name, final byte[] payload) {}
 
     @Override
     public ChaincodeEvent getEvent() {
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ClientIdentityTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ClientIdentityTest.java
index f9dae17a..9f85095d 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ClientIdentityTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ClientIdentityTest.java
@@ -6,39 +6,38 @@
 
 package org.hyperledger.fabric.contract;
 
-import org.hyperledger.fabric.TestUtil;
-import org.hyperledger.fabric.shim.ChaincodeStub;
-import org.junit.jupiter.api.Test;
-
-import java.math.BigInteger;
-
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.math.BigInteger;
+import org.hyperledger.fabric.TestUtil;
+import org.hyperledger.fabric.shim.ChaincodeStub;
+import org.junit.jupiter.api.Test;
+
 public class ClientIdentityTest {
-    /**
-     * Test client identity can be created using certificate without attributes
-     */
+    /** Test client identity can be created using certificate without attributes */
     @Test
     public void clientIdentityWithoutAttributes() throws Exception {
         final ChaincodeStub stub = new ChaincodeStubNaiveImpl();
         final ClientIdentity identity = new ClientIdentity(stub);
         assertEquals(identity.getMSPID(), "testMSPID");
-        assertEquals(identity.getId(),
+        assertEquals(
+                identity.getId(),
                 "x509::CN=admin, OU=Fabric, O=Hyperledger, ST=North Carolina, C=US::CN=example.com,"
                         + " OU=WWW, O=Internet Widgets, L=San Francisco, ST=California, C=US");
         assertEquals(identity.getAttributeValue("attr1"), null);
         assertEquals(identity.getAttributeValue("val1"), null);
-        assertEquals(identity.getX509Certificate().getSubjectX500Principal().toString(),
+        assertEquals(
+                identity.getX509Certificate().getSubjectX500Principal().toString(),
                 "CN=admin, OU=Fabric, O=Hyperledger, ST=North Carolina, C=US");
-        assertEquals(identity.getX509Certificate().getSerialNumber(), new BigInteger("689287698446788666856807436918134903862142510628"));
+        assertEquals(
+                identity.getX509Certificate().getSerialNumber(),
+                new BigInteger("689287698446788666856807436918134903862142510628"));
     }
 
-    /**
-     * Test client identity can be created using certificate with attributes
-     */
+    /** Test client identity can be created using certificate with attributes */
     @Test
     public void clientIdentityWithAttributes() throws Exception {
         final ChaincodeStub stub = new ChaincodeStubNaiveImpl();
@@ -52,20 +51,21 @@ public void clientIdentityWithAttributes() throws Exception {
         assertEquals(identity.assertAttributeValue("attr1", "val2"), false);
         assertEquals(identity.assertAttributeValue("attr2", "val1"), false);
         assertEquals(identity.getX509Certificate().getSubjectX500Principal().toString(), "CN=MyTestUserWithAttrs");
-        assertEquals(identity.getX509Certificate().getSerialNumber(), new BigInteger("172910998202207082780622887076293058980152824437"));
+        assertEquals(
+                identity.getX509Certificate().getSerialNumber(),
+                new BigInteger("172910998202207082780622887076293058980152824437"));
     }
 
-    /**
-     * Test client identity can be created using certificate with multiple
-     * attributes
-     */
+    /** Test client identity can be created using certificate with multiple attributes */
     @Test
     public void clientIdentityWithMultipleAttributes() throws Exception {
         final ChaincodeStub stub = new ChaincodeStubNaiveImpl();
         ((ChaincodeStubNaiveImpl) stub).setCertificate(TestUtil.CERT_MULTIPLE_ATTRIBUTES);
         final ClientIdentity identity = new ClientIdentity(stub);
         assertEquals(identity.getMSPID(), "testMSPID");
-        assertEquals(identity.getId(), "x509::CN=test, OU=client::CN=ca.org1.example.com, O=org1.example.com, L=San Francisco, ST=California, C=US");
+        assertEquals(
+                identity.getId(),
+                "x509::CN=test, OU=client::CN=ca.org1.example.com, O=org1.example.com, L=San Francisco, ST=California, C=US");
         assertEquals(identity.getAttributeValue("hello"), "world");
         assertEquals(identity.getAttributeValue("foo"), "bar");
         assertEquals(identity.getAttributeValue("attr1"), "val1");
@@ -74,30 +74,31 @@ public void clientIdentityWithMultipleAttributes() throws Exception {
         assertEquals(identity.assertAttributeValue("attr1", "val2"), false);
         assertEquals(identity.assertAttributeValue("hello", "val1"), false);
         assertEquals(identity.getX509Certificate().getSubjectX500Principal().toString(), "CN=test, OU=client");
-        assertEquals(identity.getX509Certificate().getSerialNumber(), new BigInteger("400549269877250942864348502164024974865235124098"));
+        assertEquals(
+                identity.getX509Certificate().getSerialNumber(),
+                new BigInteger("400549269877250942864348502164024974865235124098"));
     }
 
-    /**
-     * Test client identity can be created using certificate with long distinguished
-     * name
-     */
+    /** Test client identity can be created using certificate with long distinguished name */
     @Test
     public void clientIdentityWithLongDNs() throws Exception {
         final ChaincodeStub stub = new ChaincodeStubNaiveImpl();
         ((ChaincodeStubNaiveImpl) stub).setCertificate(TestUtil.CERT_WITH_DNS);
         final ClientIdentity identity = new ClientIdentity(stub);
         assertEquals(identity.getMSPID(), "testMSPID");
-        assertEquals(identity.getId(),
+        assertEquals(
+                identity.getId(),
                 "x509::CN=User1@org2.example.com, L=San Francisco, ST=California,"
-                + " C=US::CN=ca.org2.example.com, O=org2.example.com, L=San Francisco, ST=California, C=US");
-        assertEquals(identity.getX509Certificate().getSubjectX500Principal().toString(), "CN=User1@org2.example.com, L=San Francisco, ST=California, C=US");
-        assertEquals(identity.getX509Certificate().getSerialNumber(), new BigInteger("175217963267961225716341475631843075227"));
+                        + " C=US::CN=ca.org2.example.com, O=org2.example.com, L=San Francisco, ST=California, C=US");
+        assertEquals(
+                identity.getX509Certificate().getSubjectX500Principal().toString(),
+                "CN=User1@org2.example.com, L=San Francisco, ST=California, C=US");
+        assertEquals(
+                identity.getX509Certificate().getSerialNumber(),
+                new BigInteger("175217963267961225716341475631843075227"));
     }
 
-    /**
-     * Test client identity throws a ContractRuntimeException when creating a
-     * serialized identity fails
-     */
+    /** Test client identity throws a ContractRuntimeException when creating a serialized identity fails */
     @Test
     public void catchInvalidProtocolBufferException() {
         final ChaincodeStub stub = mock(ChaincodeStub.class);
@@ -106,18 +107,15 @@ public void catchInvalidProtocolBufferException() {
         assertThatThrownBy(() -> ContextFactory.getInstance().createContext(stub))
                 .isInstanceOf(ContractRuntimeException.class)
                 .hasMessage("Could not create new client identity");
-
     }
 
-    /**
-     * Test client identity attributes are empty when using a certificate with dummy
-     * attributes
-     */
+    /** Test client identity attributes are empty when using a certificate with dummy attributes */
     @Test
     public void createClientIdentityWithDummyAttributesCert() throws Exception {
         final ChaincodeStub stub = new ChaincodeStubNaiveImpl();
         // Create a certificate with rubbish attributes
-        final String certWithDummyAttrs = TestUtil.createCertWithIdentityAttributes("{gsdhrlxhvcilgwoueglfs,djhzxo;vjs.dcx }");
+        final String certWithDummyAttrs =
+                TestUtil.createCertWithIdentityAttributes("{gsdhrlxhvcilgwoueglfs,djhzxo;vjs.dcx }");
         ((ChaincodeStubNaiveImpl) stub).setCertificate(certWithDummyAttrs);
         final ClientIdentity identity = new ClientIdentity(stub);
 
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContextFactoryTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContextFactoryTest.java
index a10ef5de..d0c6c393 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContextFactoryTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContextFactoryTest.java
@@ -5,15 +5,14 @@
  */
 package org.hyperledger.fabric.contract;
 
-import org.hyperledger.fabric.shim.ChaincodeStub;
-import org.junit.jupiter.api.Test;
-
-import java.util.Collections;
-
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.sameInstance;
-import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.Collections;
+import org.hyperledger.fabric.shim.ChaincodeStub;
+import org.junit.jupiter.api.Test;
 
 public class ContextFactoryTest {
 
@@ -35,7 +34,8 @@ public void createContext() {
         assertThat(stub.getParameters(), is(equalTo(ctx.getStub().getParameters())));
         assertThat(stub.getTxId(), is(equalTo(ctx.getStub().getTxId())));
         assertThat(stub.getChannelId(), is(equalTo(ctx.getStub().getChannelId())));
-        assertThat(stub.invokeChaincode("cc", Collections.emptyList(), "ch0"),
+        assertThat(
+                stub.invokeChaincode("cc", Collections.emptyList(), "ch0"),
                 is(equalTo(ctx.getStub().invokeChaincode("cc", Collections.emptyList(), "ch0"))));
 
         assertThat(stub.getState("a"), is(equalTo(ctx.getStub().getState("a"))));
@@ -43,8 +43,9 @@ public void createContext() {
         assertThat(stub.getStringState("b"), is(equalTo(ctx.getStub().getStringState("b"))));
 
         assertThat(ctx.clientIdentity.getMSPID(), is(equalTo("testMSPID")));
-        assertThat(ctx.clientIdentity.getId(), is(equalTo(
-                "x509::CN=admin, OU=Fabric, O=Hyperledger, ST=North Carolina,"
-                + " C=US::CN=example.com, OU=WWW, O=Internet Widgets, L=San Francisco, ST=California, C=US")));
+        assertThat(
+                ctx.clientIdentity.getId(),
+                is(equalTo("x509::CN=admin, OU=Fabric, O=Hyperledger, ST=North Carolina,"
+                        + " C=US::CN=example.com, OU=WWW, O=Internet Widgets, L=San Francisco, ST=California, C=US")));
     }
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContextTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContextTest.java
index 2d3bf088..405e68ff 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContextTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContextTest.java
@@ -5,17 +5,15 @@
  */
 package org.hyperledger.fabric.contract;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.sameInstance;
+
 import org.hyperledger.fabric.shim.ChaincodeStub;
 import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.Matchers.sameInstance;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 public class ContextTest {
 
-    /**
-     * Test creating a new context returns what we expect
-     */
+    /** Test creating a new context returns what we expect */
     @Test
     public void getInstance() {
         final ChaincodeStub stub = new ChaincodeStubNaiveImpl();
@@ -24,14 +22,11 @@ public void getInstance() {
         assertThat(context1.getStub(), sameInstance(context2.getStub()));
     }
 
-    /**
-     * Test identity created in Context constructor matches getClientIdentity
-     */
+    /** Test identity created in Context constructor matches getClientIdentity */
     @Test
     public void getSetClientIdentity() {
         final ChaincodeStub stub = new ChaincodeStubNaiveImpl();
         final Context context = ContextFactory.getInstance().createContext(stub);
         assertThat(context.getClientIdentity(), sameInstance(context.clientIdentity));
-
     }
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContractInterfaceTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContractInterfaceTest.java
index a3b468fe..e3fcdd6a 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContractInterfaceTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContractInterfaceTest.java
@@ -5,25 +5,25 @@
  */
 package org.hyperledger.fabric.contract;
 
-import org.hyperledger.fabric.shim.ChaincodeException;
-import org.junit.jupiter.api.Test;
-
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.hyperledger.fabric.shim.ChaincodeException;
+import org.junit.jupiter.api.Test;
 
 public class ContractInterfaceTest {
     @Test
     public void createContext() {
-        assertThat((new ContractInterface() {
-        }).createContext(new ChaincodeStubNaiveImpl()), is(instanceOf(Context.class)));
+        assertThat(
+                (new ContractInterface() {}).createContext(new ChaincodeStubNaiveImpl()),
+                is(instanceOf(Context.class)));
     }
 
     @Test
     public void unknownTransaction() {
-        final ContractInterface c = new ContractInterface() {
-        };
+        final ContractInterface c = new ContractInterface() {};
 
         assertThatThrownBy(() -> c.unknownTransaction(c.createContext(new ChaincodeStubNaiveImpl())))
                 .isInstanceOf(ChaincodeException.class)
@@ -32,16 +32,14 @@ public void unknownTransaction() {
 
     @Test
     public void beforeTransaction() {
-        final ContractInterface c = new ContractInterface() {
-        };
+        final ContractInterface c = new ContractInterface() {};
 
         c.beforeTransaction(c.createContext(new ChaincodeStubNaiveImpl()));
     }
 
     @Test
     public void afterTransaction() {
-        final ContractInterface c = new ContractInterface() {
-        };
+        final ContractInterface c = new ContractInterface() {};
         c.afterTransaction(c.createContext(new ChaincodeStubNaiveImpl()), "ReturnValue");
     }
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContractRouterTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContractRouterTest.java
index 987922f5..b5692cc2 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContractRouterTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContractRouterTest.java
@@ -5,7 +5,19 @@
  */
 package org.hyperledger.fabric.contract;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
 import contract.SampleContract;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.List;
 import org.hyperledger.fabric.contract.annotation.Contract;
 import org.hyperledger.fabric.contract.execution.ExecutionFactory;
 import org.hyperledger.fabric.contract.execution.InvocationRequest;
@@ -16,23 +28,10 @@
 import org.hyperledger.fabric.shim.NettyChaincodeServer;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-
 public class ContractRouterTest {
     @Test
     public void testCreateFailsWithoutValidOptions() {
-        assertThatThrownBy(() -> new ContractRouter(new String[]{}))
+        assertThatThrownBy(() -> new ContractRouter(new String[] {}))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessageContaining("The chaincode id must be specified using either the -i or --i command "
                         + "line options or the CORE_CHAINCODE_ID_NAME environment variable.");
@@ -40,7 +39,7 @@ public void testCreateFailsWithoutValidOptions() {
 
     @Test
     public void testCreateAndScan() {
-        final ContractRouter r = new ContractRouter(new String[]{"-a", "127.0.0.1:7052", "-i", "testId"});
+        final ContractRouter r = new ContractRouter(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         r.findAllContracts();
         final ChaincodeStub s = new ChaincodeStubNaiveImpl();
 
@@ -50,7 +49,9 @@ public void testCreateAndScan() {
         args.add("asdf");
         ((ChaincodeStubNaiveImpl) s).setStringArgs(args);
         final InvocationRequest request = ExecutionFactory.getInstance().createRequest(s);
-        assertThat(request.getNamespace(), is(equalTo(SampleContract.class.getAnnotation(Contract.class).name())));
+        assertThat(
+                request.getNamespace(),
+                is(equalTo(SampleContract.class.getAnnotation(Contract.class).name())));
         assertThat(request.getMethod(), is(equalTo("t1")));
         assertThat(request.getRequestName(), is(equalTo("samplecontract:t1")));
         assertThat(request.getArgs(), is(contains(s.getArgs().get(1))));
@@ -58,7 +59,7 @@ public void testCreateAndScan() {
 
     @Test
     public void testInit() {
-        final ContractRouter r = new ContractRouter(new String[]{"-a", "127.0.0.1:7052", "-i", "testId"});
+        final ContractRouter r = new ContractRouter(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         r.findAllContracts();
         final ChaincodeStub s = new ChaincodeStubNaiveImpl();
 
@@ -83,13 +84,10 @@ public void testInit() {
         assertThat(SampleContract.getT1Invoked(), is(1));
     }
 
-    /**
-     * Test invoking two transaction functions in a contract via fully qualified
-     * name
-     */
+    /** Test invoking two transaction functions in a contract via fully qualified name */
     @Test
     public void testInvokeTwoTxnsThatExist() {
-        final ContractRouter r = new ContractRouter(new String[]{"-a", "127.0.0.1:7052", "-i", "testId"});
+        final ContractRouter r = new ContractRouter(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         r.findAllContracts();
         final ChaincodeStub s = new ChaincodeStubNaiveImpl();
 
@@ -136,7 +134,7 @@ public void testInvokeTwoTxnsThatExist() {
 
     @Test
     public void testInvokeTxnWithDefinedName() {
-        final ContractRouter r = new ContractRouter(new String[]{"-a", "127.0.0.1:7052", "-i", "testId"});
+        final ContractRouter r = new ContractRouter(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         r.findAllContracts();
         final ChaincodeStub s = new ChaincodeStubNaiveImpl();
 
@@ -161,12 +159,10 @@ public void testInvokeTxnWithDefinedName() {
         assertThat(SampleContract.getT1Invoked(), is(0));
     }
 
-    /**
-     * Test invoking two transaction functions in a contract via default name name
-     */
+    /** Test invoking two transaction functions in a contract via default name name */
     @Test
     public void testInvokeTwoTxnsWithDefaultNamespace() {
-        final ContractRouter r = new ContractRouter(new String[]{"-a", "127.0.0.1:7052", "-i", "testId"});
+        final ContractRouter r = new ContractRouter(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         r.findAllContracts();
         final ChaincodeStub s = new ChaincodeStubNaiveImpl();
 
@@ -213,7 +209,7 @@ public void testInvokeTwoTxnsWithDefaultNamespace() {
 
     @Test
     public void testInvokeTxnWithDefinedNameUsingMethodName() {
-        final ContractRouter r = new ContractRouter(new String[]{"-a", "127.0.0.1:7052", "-i", "testId"});
+        final ContractRouter r = new ContractRouter(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         r.findAllContracts();
         final ChaincodeStub s = new ChaincodeStubNaiveImpl();
 
@@ -240,7 +236,7 @@ public void testInvokeTxnWithDefinedNameUsingMethodName() {
 
     @Test
     public void testInvokeContractThatDoesNotExist() {
-        final ContractRouter r = new ContractRouter(new String[]{"-a", "127.0.0.1:7052", "-i", "testId"});
+        final ContractRouter r = new ContractRouter(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         r.findAllContracts();
         final ChaincodeStub s = new ChaincodeStubNaiveImpl();
 
@@ -267,7 +263,7 @@ public void testInvokeContractThatDoesNotExist() {
 
     @Test
     public void testInvokeTxnThatDoesNotExist() {
-        final ContractRouter r = new ContractRouter(new String[]{"-a", "127.0.0.1:7052", "-i", "testId"});
+        final ContractRouter r = new ContractRouter(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         r.findAllContracts();
         final ChaincodeStub s = new ChaincodeStubNaiveImpl();
 
@@ -294,7 +290,7 @@ public void testInvokeTxnThatDoesNotExist() {
 
     @Test
     public void testInvokeTxnThatReturnsNullString() {
-        final ContractRouter r = new ContractRouter(new String[]{"-a", "127.0.0.1:7052", "-i", "testId"});
+        final ContractRouter r = new ContractRouter(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         r.findAllContracts();
         final ChaincodeStub s = new ChaincodeStubNaiveImpl();
 
@@ -321,7 +317,7 @@ public void testInvokeTxnThatReturnsNullString() {
 
     @Test
     public void testInvokeTxnThatThrowsAnException() {
-        final ContractRouter r = new ContractRouter(new String[]{"-a", "127.0.0.1:7052", "-i", "testId"});
+        final ContractRouter r = new ContractRouter(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         r.findAllContracts();
         final ChaincodeStub s = new ChaincodeStubNaiveImpl();
 
@@ -335,7 +331,6 @@ public void testInvokeTxnThatThrowsAnException() {
         SampleContract.setAfterInvoked(0);
         SampleContract.setDoWorkInvoked(0);
 
-
         final Chaincode.Response response = r.invoke(s);
         assertThat(response, is(notNullValue()));
         assertThat(response.getStatus(), is(Chaincode.Response.Status.INTERNAL_SERVER_ERROR));
@@ -348,7 +343,7 @@ public void testInvokeTxnThatThrowsAnException() {
 
     @Test
     public void testInvokeTxnThatThrowsAChaincodeException() {
-        final ContractRouter r = new ContractRouter(new String[]{"-a", "127.0.0.1:7052", "-i", "testId"});
+        final ContractRouter r = new ContractRouter(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         r.findAllContracts();
         final ChaincodeStub s = new ChaincodeStubNaiveImpl();
 
@@ -362,7 +357,6 @@ public void testInvokeTxnThatThrowsAChaincodeException() {
         SampleContract.setAfterInvoked(0);
         SampleContract.setDoWorkInvoked(0);
 
-
         final Chaincode.Response response = r.invoke(s);
         assertThat(response, is(notNullValue()));
         assertThat(response.getStatus(), is(Chaincode.Response.Status.INTERNAL_SERVER_ERROR));
@@ -373,9 +367,7 @@ public void testInvokeTxnThatThrowsAChaincodeException() {
         assertThat(SampleContract.getDoWorkInvoked(), is(0));
     }
 
-    /**
-     * Test confirming ContractRuntimeExceptions can be created.
-     */
+    /** Test confirming ContractRuntimeExceptions can be created. */
     @Test
     public void createContractRuntimeExceptions() {
         final ContractRuntimeException cre1 = new ContractRuntimeException("failure");
@@ -387,17 +379,17 @@ public void createContractRuntimeExceptions() {
     public void testStartingContractRouterWithStartingAChaincodeServer() throws IOException {
         ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
         chaincodeServerProperties.setServerAddress(new InetSocketAddress("0.0.0.0", 9999));
-        final ContractRouter r = new ContractRouter(new String[]{"-i", "testId"});
+        final ContractRouter r = new ContractRouter(new String[] {"-i", "testId"});
         ChaincodeServer chaincodeServer = new NettyChaincodeServer(r, chaincodeServerProperties);
 
         new Thread(() -> {
-            try {
-                r.startRouterWithChaincodeServer(chaincodeServer);
-            } catch (IOException | InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-        ).start();
+                    try {
+                        r.startRouterWithChaincodeServer(chaincodeServer);
+                    } catch (IOException | InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                })
+                .start();
 
         try {
             Thread.sleep(5000);
@@ -419,8 +411,10 @@ public void testStartingContractRouterWithStartingAChaincodeServer() throws IOEx
 
         final Chaincode.Response response = r.init(s);
         assertThat(response, is(notNullValue()));
-        assertThat(response.getMessage() + " " + response.getStringPayload() + response.toString(),
-                response.getStatus(), is(Chaincode.Response.Status.SUCCESS));
+        assertThat(
+                response.getMessage() + " " + response.getStringPayload() + response.toString(),
+                response.getStatus(),
+                is(Chaincode.Response.Status.SUCCESS));
         assertThat(response.getMessage(), is(nullValue()));
         assertThat(response.getStringPayload(), is(equalTo("asdf")));
         assertThat(SampleContract.getBeforeInvoked(), is(1));
@@ -430,5 +424,4 @@ public void testStartingContractRouterWithStartingAChaincodeServer() throws IOEx
 
         chaincodeServer.stop();
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/MyType.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/MyType.java
index 956f774a..893aa81e 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/MyType.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/MyType.java
@@ -18,8 +18,8 @@ public final class MyType {
 
     private String state = "";
 
-    public static final  String STARTED = "STARTED";
-    public static final  String STOPPED = "STOPPED";
+    public static final String STARTED = "STARTED";
+    public static final String STOPPED = "STOPPED";
 
     public void setState(final String state) {
         this.state = state;
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/MyType2.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/MyType2.java
index 53cc5fcc..9da03bbc 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/MyType2.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/MyType2.java
@@ -15,7 +15,21 @@ public final class MyType2 {
     @Property()
     private String value;
 
-    @Property(schema = {"title", "MrProperty", "Pattern", "[a-z]", "uniqueItems", "false", "required", "true,false", "enum", "a,bee,cee,dee", "minimum", "42"})
+    @Property(
+            schema = {
+                "title",
+                "MrProperty",
+                "Pattern",
+                "[a-z]",
+                "uniqueItems",
+                "false",
+                "required",
+                "true,false",
+                "enum",
+                "a,bee,cee,dee",
+                "minimum",
+                "42"
+            })
     private String constrainedValue;
 
     public MyType2 setValue(final String value) {
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/TransactionExceptionTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/TransactionExceptionTest.java
index edd4e799..3cc4df28 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/TransactionExceptionTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/TransactionExceptionTest.java
@@ -5,12 +5,12 @@
  */
 package org.hyperledger.fabric.contract;
 
-import org.hyperledger.fabric.shim.ChaincodeException;
-import org.junit.jupiter.api.Test;
-
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.hyperledger.fabric.shim.ChaincodeException;
+import org.junit.jupiter.api.Test;
 
 public class TransactionExceptionTest {
 
@@ -71,7 +71,8 @@ public void testMessageAndPayloadArgConstructor() {
 
     @Test
     public void testMessagePayloadAndCauseArgConstructor() {
-        final ChaincodeException e = new ChaincodeException("Failure", new byte[] {'P', 'a', 'y', 'l', 'o', 'a', 'd'}, new Error("Cause"));
+        final ChaincodeException e =
+                new ChaincodeException("Failure", new byte[] {'P', 'a', 'y', 'l', 'o', 'a', 'd'}, new Error("Cause"));
         assertThat(e.getMessage(), is("Failure"));
         assertThat(e.getPayload(), is(new byte[] {'P', 'a', 'y', 'l', 'o', 'a', 'd'}));
         assertThat(e.getCause().getMessage(), is("Cause"));
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/execution/ContractExecutionServiceTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/execution/ContractExecutionServiceTest.java
index cbf1f2ce..67d006d3 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/execution/ContractExecutionServiceTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/execution/ContractExecutionServiceTest.java
@@ -6,7 +6,19 @@
 
 package org.hyperledger.fabric.contract.execution;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import contract.SampleContract;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.Collections;
 import org.hyperledger.fabric.contract.ChaincodeStubNaiveImpl;
 import org.hyperledger.fabric.contract.Context;
 import org.hyperledger.fabric.contract.ContractInterface;
@@ -21,23 +33,11 @@
 import org.hyperledger.fabric.shim.ChaincodeStub;
 import org.junit.jupiter.api.Test;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
-import java.util.ArrayList;
-import java.util.Collections;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 public final class ContractExecutionServiceTest {
     @Test
     public void noReturnValue()
-            throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException, SecurityException {
+            throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException,
+                    SecurityException {
         JSONTransactionSerializer jts = new JSONTransactionSerializer();
         SerializerRegistryImpl serializerRegistry = spy(new SerializerRegistryImpl());
         ContractExecutionService ces = new ContractExecutionService(serializerRegistry);
@@ -51,18 +51,19 @@ public void noReturnValue()
 
         when(txFn.getRouting()).thenReturn(routing);
         when(req.getArgs()).thenReturn(new ArrayList());
-        when(routing.getMethod()).thenReturn(SampleContract.class.getMethod("noReturn", new Class[] {Context.class}));
+        when(routing.getMethod())
+                .thenReturn(SampleContract.class.getMethod("noReturn", new Class[] {Context.class}));
         when(routing.getContractInstance()).thenReturn(contract);
         when(serializerRegistry.getSerializer(any(), any())).thenReturn(jts);
         ces.executeRequest(txFn, req, stub);
 
         verify(contract).beforeTransaction(any());
-
     }
 
     @Test()
     public void failureToInvoke()
-            throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException, SecurityException {
+            throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException,
+                    SecurityException {
         JSONTransactionSerializer jts = new JSONTransactionSerializer();
         SerializerRegistryImpl serializerRegistry = spy(new SerializerRegistryImpl());
         ContractExecutionService ces = new ContractExecutionService(serializerRegistry);
@@ -74,10 +75,8 @@ public void failureToInvoke()
 
         ChaincodeStub stub = mock(ChaincodeStub.class);
 
-
         when(txFn.getRouting()).thenReturn(routing);
-        when(req.getArgs()).thenReturn(new ArrayList() {
-        });
+        when(req.getArgs()).thenReturn(new ArrayList() {});
 
         when(routing.getContractInstance()).thenThrow(IllegalAccessException.class);
         when(routing.toString()).thenReturn("MockMethodName:MockClassName");
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/execution/JSONTransactionSerializerTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/execution/JSONTransactionSerializerTest.java
index 169ad41f..eb15c8c9 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/execution/JSONTransactionSerializerTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/execution/JSONTransactionSerializerTest.java
@@ -6,12 +6,11 @@
 
 package org.hyperledger.fabric.contract.execution;
 
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
-
 import org.hyperledger.fabric.contract.AllTypesAsset;
 import org.hyperledger.fabric.contract.MyType;
 import org.hyperledger.fabric.contract.metadata.MetadataBuilder;
@@ -224,7 +223,6 @@ public void fromBufferObject() {
         final MyType[] o = (MyType[]) serializer.fromBuffer(buffer, ts);
         assertThat(o[0].toString(), equalTo("++++ MyType: hello"));
         assertThat(o[1].toString(), equalTo("++++ MyType: world"));
-
     }
 
     @Test
@@ -279,8 +277,5 @@ public void fromBufferErrors() {
         serializer.toBuffer(null, ts);
     }
 
-    class MyTestObject {
-
-    }
-
+    class MyTestObject {}
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/metadata/MetadataBuilderTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/metadata/MetadataBuilderTest.java
index 8204b343..903a287f 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/metadata/MetadataBuilderTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/metadata/MetadataBuilderTest.java
@@ -6,6 +6,10 @@
 package org.hyperledger.fabric.contract.metadata;
 
 import contract.SampleContract;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.HashMap;
 import org.everit.json.schema.loader.SchemaClient;
 import org.everit.json.schema.loader.internal.DefaultSchemaClient;
 import org.hyperledger.fabric.contract.ChaincodeStubNaiveImpl;
@@ -18,19 +22,20 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.io.InputStream;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-
 public final class MetadataBuilderTest {
     private final String expectedMetadataString = "    {\n" + "       \"components\": {\"schemas\": {}},\n"
-            + "       \"$schema\": \"https://fabric-shim.github.io/contract-schema.json\",\n" + "       \"contracts\": {\"SampleContract\": {\n"
-            + "          \"name\": \"SampleContract\",\n" + "          \"transactions\": [],\n" + "          \"info\": {\n"
-            + "             \"license\": {\"name\": \"\"},\n" + "             \"description\": \"\",\n" + "             \"termsOfService\": \"\",\n"
-            + "             \"title\": \"\",\n" + "             \"version\": \"\",\n" + "             \"contact\": {\"email\": \"fred@example.com\"}\n"
-            + "          }\n" + "       }},\n" + "       \"info\": {\n" + "          \"license\": {\"name\": \"\"},\n" + "          \"description\": \"\",\n"
-            + "          \"termsOfService\": \"\",\n" + "          \"title\": \"\",\n" + "          \"version\": \"\",\n"
+            + "       \"$schema\": \"https://fabric-shim.github.io/contract-schema.json\",\n"
+            + "       \"contracts\": {\"SampleContract\": {\n"
+            + "          \"name\": \"SampleContract\",\n" + "          \"transactions\": [],\n"
+            + "          \"info\": {\n"
+            + "             \"license\": {\"name\": \"\"},\n" + "             \"description\": \"\",\n"
+            + "             \"termsOfService\": \"\",\n"
+            + "             \"title\": \"\",\n" + "             \"version\": \"\",\n"
+            + "             \"contact\": {\"email\": \"fred@example.com\"}\n"
+            + "          }\n" + "       }},\n" + "       \"info\": {\n" + "          \"license\": {\"name\": \"\"},\n"
+            + "          \"description\": \"\",\n"
+            + "          \"termsOfService\": \"\",\n" + "          \"title\": \"\",\n"
+            + "          \"version\": \"\",\n"
             + "          \"contact\": {\"email\": \"fred@example.com\"}\n" + "       }\n" + "    }\n" + "";
 
     // fields are private, so use reflection to bypass this for unit testing
@@ -53,7 +58,6 @@ public void beforeAndAfterEach() {
         setMetadataBuilderField("contractMap", new HashMap>());
         setMetadataBuilderField("overallInfoMap", new HashMap());
         setMetadataBuilderField("schemaClient", new DefaultSchemaClient());
-
     }
 
     @Test
@@ -74,9 +78,7 @@ public void defaultSchemasNotLoadedFromNetwork() {
             public InputStream get(final String uri) {
                 throw new RuntimeException("Refusing to load schema: " + uri);
             }
-
         });
         MetadataBuilder.validate();
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/metadata/TypeSchemaTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/metadata/TypeSchemaTest.java
index d06e6d6d..4139c165 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/metadata/TypeSchemaTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/metadata/TypeSchemaTest.java
@@ -5,8 +5,8 @@
  */
 package org.hyperledger.fabric.contract.metadata;
 
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.hyperledger.fabric.contract.annotation.DataType;
@@ -21,8 +21,7 @@
 public class TypeSchemaTest {
 
     @BeforeEach
-    public void beforeEach() {
-    }
+    public void beforeEach() {}
 
     @Test
     public void putIfNotNull() {
@@ -90,8 +89,7 @@ public void getItems() {
     }
 
     @DataType
-    class MyType {
-    }
+    class MyType {}
 
     @Test
     public void getTypeClass() {
@@ -138,7 +136,6 @@ public void getTypeClass() {
         array.put("type", "array");
         array.put("items", ts);
         assertThat(array.getTypeClass(mockRegistry), equalTo(MyType[].class));
-
     }
 
     @Test
@@ -188,7 +185,6 @@ public void typeConvertPrimitives() {
 
         rts = TypeSchema.typeConvert(boolean.class);
         assertThat(rts.getType(), equalTo("boolean"));
-
     }
 
     @Test
@@ -235,6 +231,5 @@ public void validate() {
         MetadataBuilder.addComponent(dtd);
         final JSONObject json = new JSONObject();
         ts.validate(json);
-
     }
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/ContractDefinitionTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/ContractDefinitionTest.java
index 0a564013..a948720c 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/ContractDefinitionTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/ContractDefinitionTest.java
@@ -5,7 +5,14 @@
  */
 package org.hyperledger.fabric.contract.routing;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.startsWith;
+
 import contract.SampleContract;
+import java.lang.reflect.Method;
+import java.security.Permission;
 import org.hyperledger.fabric.contract.Context;
 import org.hyperledger.fabric.contract.ContractInterface;
 import org.hyperledger.fabric.contract.ContractRuntimeException;
@@ -14,14 +21,6 @@
 import org.hyperledger.fabric.contract.routing.impl.ContractDefinitionImpl;
 import org.junit.jupiter.api.Test;
 
-import java.lang.reflect.Method;
-import java.security.Permission;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.startsWith;
-
 public class ContractDefinitionTest {
     @Test
     public void constructor() throws NoSuchMethodException, SecurityException {
@@ -31,9 +30,7 @@ public void constructor() throws NoSuchMethodException, SecurityException {
     }
 
     @Contract(name = "", info = @Info())
-    public class FailureTestObject {
-
-    }
+    public class FailureTestObject {}
 
     private boolean fail;
     private final int step = 1;
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/DataTypeDefinitionTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/DataTypeDefinitionTest.java
index 015357ec..f08e3bd4 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/DataTypeDefinitionTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/DataTypeDefinitionTest.java
@@ -5,17 +5,16 @@
  */
 package org.hyperledger.fabric.contract.routing;
 
-import org.hyperledger.fabric.contract.MyType2;
-import org.hyperledger.fabric.contract.routing.impl.DataTypeDefinitionImpl;
-import org.junit.jupiter.api.Test;
-
-import java.util.Map;
-
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasKey;
 
+import java.util.Map;
+import org.hyperledger.fabric.contract.MyType2;
+import org.hyperledger.fabric.contract.routing.impl.DataTypeDefinitionImpl;
+import org.junit.jupiter.api.Test;
+
 public class DataTypeDefinitionTest {
     @Test
     public void constructor() {
@@ -38,7 +37,5 @@ public void constructor() {
         assertThat(ts, hasEntry("required", new String[] {"true", "false"}));
         assertThat(ts, hasEntry("enum", new String[] {"a", "bee", "cee", "dee"}));
         assertThat(ts, hasEntry("minimum", 42));
-
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/ParameterDefinitionTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/ParameterDefinitionTest.java
index 823dd06f..84524443 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/ParameterDefinitionTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/ParameterDefinitionTest.java
@@ -5,19 +5,19 @@
  */
 package org.hyperledger.fabric.contract.routing;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.lang.reflect.Parameter;
 import org.hyperledger.fabric.contract.metadata.TypeSchema;
 import org.hyperledger.fabric.contract.routing.impl.ParameterDefinitionImpl;
 import org.junit.jupiter.api.Test;
 
-import java.lang.reflect.Parameter;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
 public class ParameterDefinitionTest {
     @Test
     public void constructor() throws NoSuchMethodException, SecurityException {
-        final Parameter[] params = String.class.getMethod("concat", String.class).getParameters();
+        final Parameter[] params =
+                String.class.getMethod("concat", String.class).getParameters();
         final ParameterDefinition pd = new ParameterDefinitionImpl("test", String.class, new TypeSchema(), params[0]);
         assertThat(pd.toString(), equalTo("test-class java.lang.String-{}-java.lang.String arg0"));
         assertThat(pd.getTypeClass(), equalTo(String.class));
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/PropertyDefinitionTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/PropertyDefinitionTest.java
index 28cd785e..9ec68a68 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/PropertyDefinitionTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/PropertyDefinitionTest.java
@@ -5,15 +5,14 @@
  */
 package org.hyperledger.fabric.contract.routing;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.lang.reflect.Field;
 import org.hyperledger.fabric.contract.metadata.TypeSchema;
 import org.hyperledger.fabric.contract.routing.impl.PropertyDefinitionImpl;
 import org.junit.jupiter.api.Test;
 
-import java.lang.reflect.Field;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
 public class PropertyDefinitionTest {
     @Test
     public void constructor() throws NoSuchMethodException, SecurityException {
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/TxFunctionTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/TxFunctionTest.java
index 1096ceac..428a9483 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/TxFunctionTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/TxFunctionTest.java
@@ -5,6 +5,14 @@
  */
 package org.hyperledger.fabric.contract.routing;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.startsWith;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+
 import org.hyperledger.fabric.contract.Context;
 import org.hyperledger.fabric.contract.ContractInterface;
 import org.hyperledger.fabric.contract.ContractRuntimeException;
@@ -16,32 +24,18 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.startsWith;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-
 public class TxFunctionTest {
     @Contract()
     class TestObject implements ContractInterface {
 
         @Transaction()
-        public void testMethod1(final Context ctx) {
-
-        }
+        public void testMethod1(final Context ctx) {}
 
         @Transaction()
-        public void testMethod2(final Context ctx, @Property(schema = {"a", "b"}) final int arg) {
-
-        }
+        public void testMethod2(final Context ctx, @Property(schema = {"a", "b"}) final int arg) {}
 
         @Transaction()
-        public void wibble(final String arg1) {
-
-        }
+        public void wibble(final String arg1) {}
     }
 
     @Test
@@ -50,7 +44,8 @@ public void constructor() throws NoSuchMethodException, SecurityException {
         final ContractDefinition cd = mock(ContractDefinition.class);
         Mockito.when(cd.getAnnotation()).thenReturn(test.getClass().getAnnotation(Contract.class));
 
-        final TxFunction txfn = new TxFunctionImpl(test.getClass().getMethod("testMethod1", new Class[] {Context.class}), cd);
+        final TxFunction txfn =
+                new TxFunctionImpl(test.getClass().getMethod("testMethod1", new Class[] {Context.class}), cd);
         final String name = txfn.getName();
         assertEquals(name, "testMethod1");
 
@@ -62,7 +57,8 @@ public void property() throws NoSuchMethodException, SecurityException {
         final TestObject test = new TestObject();
         final ContractDefinition cd = mock(ContractDefinition.class);
         Mockito.when(cd.getAnnotation()).thenReturn(test.getClass().getAnnotation(Contract.class));
-        final TxFunction txfn = new TxFunctionImpl(test.getClass().getMethod("testMethod2", new Class[] {Context.class, int.class}), cd);
+        final TxFunction txfn = new TxFunctionImpl(
+                test.getClass().getMethod("testMethod2", new Class[] {Context.class, int.class}), cd);
         final String name = txfn.getName();
         assertEquals(name, "testMethod2");
 
@@ -76,7 +72,6 @@ public void property() throws NoSuchMethodException, SecurityException {
         final TypeSchema rts = txfn.getReturnSchema();
         System.out.println(ts);
         assertEquals(ts, rts);
-
     }
 
     @Test
@@ -88,5 +83,4 @@ public void invaldtxfn() throws NoSuchMethodException, SecurityException {
         assertThatThrownBy(() -> new TxFunctionImpl(test.getClass().getMethod("wibble", String.class), cd))
                 .isInstanceOf(ContractRuntimeException.class);
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/TypeRegistryTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/TypeRegistryTest.java
index 0fc5f419..16c59648 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/TypeRegistryTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/routing/TypeRegistryTest.java
@@ -5,15 +5,14 @@
  */
 package org.hyperledger.fabric.contract.routing;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.util.Collection;
 import org.hyperledger.fabric.contract.routing.impl.DataTypeDefinitionImpl;
 import org.hyperledger.fabric.contract.routing.impl.TypeRegistryImpl;
 import org.junit.jupiter.api.Test;
 
-import java.util.Collection;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
 public class TypeRegistryTest {
     @Test
     public void addDataType() {
@@ -45,5 +44,4 @@ public void getAllDataTypes() {
         final Collection c = tr.getAllDataTypes();
         assertThat(c.size(), equalTo(3));
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/simplepath/ContractSimplePathTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/simplepath/ContractSimplePathTest.java
index 2286435d..489919d4 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/simplepath/ContractSimplePathTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/simplepath/ContractSimplePathTest.java
@@ -5,7 +5,15 @@
  */
 package org.hyperledger.fabric.contract.simplepath;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.READY;
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.REGISTER;
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.TRANSACTION;
+
 import com.google.protobuf.ByteString;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 import org.hyperledger.fabric.contract.ContractRouter;
 import org.hyperledger.fabric.protos.peer.ChaincodeInput;
 import org.hyperledger.fabric.protos.peer.ChaincodeInput.Builder;
@@ -22,15 +30,6 @@
 import uk.org.webcompere.systemstubs.jupiter.SystemStub;
 import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.READY;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.REGISTER;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.TRANSACTION;
-
 @ExtendWith(SystemStubsExtension.class)
 public final class ContractSimplePathTest {
     @SystemStub
@@ -73,7 +72,8 @@ public ChaincodeMessage newInvokeFn(final String[] args) {
             invokePayload.addArgs(ByteString.copyFromUtf8(arg));
         }
 
-        return MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0", invokePayload.build().toByteString(), null);
+        return MessageUtil.newEventMessage(
+                TRANSACTION, "testChannel", "0", invokePayload.build().toByteString(), null);
     }
 
     public String getLastReturnString() throws Exception {
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/ledger/LedgerTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/ledger/LedgerTest.java
index daa3a511..42800291 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/ledger/LedgerTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/ledger/LedgerTest.java
@@ -68,5 +68,4 @@ public void getOrganizationCollection() {
         final Collection collection2 = ledger.getOrganizationCollection("org1");
         assertThat(collection2).isNotSameAs(collection);
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/metrics/MetricsTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/metrics/MetricsTest.java
index b57c9e5c..eb562ade 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/metrics/MetricsTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/metrics/MetricsTest.java
@@ -10,7 +10,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Properties;
-
 import org.hyperledger.fabric.metrics.impl.DefaultProvider;
 import org.hyperledger.fabric.metrics.impl.NullProvider;
 import org.junit.jupiter.api.DisplayName;
@@ -21,18 +20,13 @@ public class MetricsTest {
 
     public static class TestProvider implements MetricsProvider {
 
-        public TestProvider() {
-
-        }
+        public TestProvider() {}
 
         @Override
-        public void setTaskMetricsCollector(final TaskMetricsCollector taskService) {
-        }
+        public void setTaskMetricsCollector(final TaskMetricsCollector taskService) {}
 
         @Override
-        public void initialize(final Properties props) {
-        }
-
+        public void initialize(final Properties props) {}
     }
 
     @Nested
@@ -51,9 +45,12 @@ public void metricsEnabledUnknownProvider() {
             props.put("CHAINCODE_METRICS_PROVIDER", "org.example.metrics.provider");
             props.put("CHAINCODE_METRICS_ENABLED", "true");
 
-            assertThrows(RuntimeException.class, () -> {
-                final MetricsProvider provider = Metrics.initialize(props);
-            }, "Unable to start metrics");
+            assertThrows(
+                    RuntimeException.class,
+                    () -> {
+                        final MetricsProvider provider = Metrics.initialize(props);
+                    },
+                    "Unable to start metrics");
         }
 
         @Test
@@ -63,7 +60,6 @@ public void metricsNoProvider() {
 
             final MetricsProvider provider = Metrics.initialize(props);
             assertTrue(provider instanceof DefaultProvider);
-
         }
 
         @Test
@@ -75,7 +71,5 @@ public void metricsValid() {
 
             assertThat(provider).isExactlyInstanceOf(MetricsTest.TestProvider.class);
         }
-
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/metrics/impl/DefaultProviderTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/metrics/impl/DefaultProviderTest.java
index 985e4be4..0da931aa 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/metrics/impl/DefaultProviderTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/metrics/impl/DefaultProviderTest.java
@@ -13,7 +13,6 @@
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-
 import org.hyperledger.fabric.metrics.MetricsProvider;
 import org.hyperledger.fabric.metrics.TaskMetricsCollector;
 import org.junit.jupiter.api.Test;
@@ -84,10 +83,11 @@ public int getActiveCount() {
             Mockito.verify(mockHandler, Mockito.atLeast(1)).publish(argumentCaptor.capture());
             LogRecord lr = argumentCaptor.getValue();
             String msg = lr.getMessage();
-            assertThat(msg).contains("{ \"active_count\":0 , \"pool_size\":0 , \"core_pool_size\":0 , \"current_task_count\":0 , \"current_queue_depth\":0 ");
+            assertThat(msg)
+                    .contains(
+                            "{ \"active_count\":0 , \"pool_size\":0 , \"core_pool_size\":0 , \"current_task_count\":0 , \"current_queue_depth\":0 ");
         } finally {
             perfLogger.setLevel(original);
         }
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeBaseTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeBaseTest.java
index 6fd7ef03..7cd97a1a 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeBaseTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeBaseTest.java
@@ -6,8 +6,19 @@
 
 package org.hyperledger.fabric.shim;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.stub.StreamObserver;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Properties;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
 import org.hyperledger.fabric.metrics.Metrics;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.shim.chaincode.EmptyChaincode;
@@ -22,18 +33,6 @@
 import uk.org.webcompere.systemstubs.jupiter.SystemStub;
 import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension;
 
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.Properties;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
 @ExtendWith(SystemStubsExtension.class)
 public class ChaincodeBaseTest {
     @SystemStub
@@ -42,81 +41,115 @@ public class ChaincodeBaseTest {
     @Test
     public void testNewSuccessResponseEmpty() {
         final org.hyperledger.fabric.shim.Chaincode.Response response = ResponseUtils.newSuccessResponse();
-        assertThat(response.getStatus()).as("Response status").isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.SUCCESS);
+        assertThat(response.getStatus())
+                .as("Response status")
+                .isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.SUCCESS);
         assertThat(response.getMessage()).as("Response message").isNull();
         assertThat(response.getPayload()).as("Response payload").isNull();
     }
 
     @Test
     public void testNewSuccessResponseWithMessage() {
-        final org.hyperledger.fabric.shim.Chaincode.Response response = ResponseUtils.newSuccessResponse("Simple message");
-        assertThat(response.getStatus()).as("Response status").isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.SUCCESS);
+        final org.hyperledger.fabric.shim.Chaincode.Response response =
+                ResponseUtils.newSuccessResponse("Simple message");
+        assertThat(response.getStatus())
+                .as("Response status")
+                .isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.SUCCESS);
         assertThat(response.getMessage()).as("Response message").isEqualTo("Simple message");
         assertThat(response.getPayload()).as("Response payload").isNull();
     }
 
     @Test
     public void testNewSuccessResponseWithPayload() {
-        final org.hyperledger.fabric.shim.Chaincode.Response response = ResponseUtils.newSuccessResponse("Simple payload".getBytes(Charset.defaultCharset()));
-        assertThat(response.getStatus()).as("Response status").isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.SUCCESS);
+        final org.hyperledger.fabric.shim.Chaincode.Response response =
+                ResponseUtils.newSuccessResponse("Simple payload".getBytes(Charset.defaultCharset()));
+        assertThat(response.getStatus())
+                .as("Response status")
+                .isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.SUCCESS);
         assertThat(response.getMessage()).as("Response message").isNull();
-        assertThat(response.getPayload()).as("Response payload").isEqualTo("Simple payload".getBytes(Charset.defaultCharset()));
+        assertThat(response.getPayload())
+                .as("Response payload")
+                .isEqualTo("Simple payload".getBytes(Charset.defaultCharset()));
     }
 
     @Test
     public void testNewSuccessResponseWithMessageAndPayload() {
-        final org.hyperledger.fabric.shim.Chaincode.Response response = ResponseUtils.newSuccessResponse("Simple message",
-                "Simple payload".getBytes(Charset.defaultCharset()));
-        assertThat(response.getStatus()).as("Response status").isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.SUCCESS);
+        final org.hyperledger.fabric.shim.Chaincode.Response response =
+                ResponseUtils.newSuccessResponse("Simple message", "Simple payload".getBytes(Charset.defaultCharset()));
+        assertThat(response.getStatus())
+                .as("Response status")
+                .isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.SUCCESS);
         assertThat(response.getMessage()).as("Response message").isEqualTo("Simple message");
-        assertThat(response.getPayload()).as("Response payload").isEqualTo("Simple payload".getBytes(Charset.defaultCharset()));
+        assertThat(response.getPayload())
+                .as("Response payload")
+                .isEqualTo("Simple payload".getBytes(Charset.defaultCharset()));
     }
 
     @Test
     public void testNewErrorResponseEmpty() {
         final org.hyperledger.fabric.shim.Chaincode.Response response = ResponseUtils.newErrorResponse();
-        assertThat(response.getStatus()).as("Response status").isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.INTERNAL_SERVER_ERROR);
+        assertThat(response.getStatus())
+                .as("Response status")
+                .isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.INTERNAL_SERVER_ERROR);
         assertThat(response.getMessage()).as("Response message").isNull();
         assertThat(response.getPayload()).as("Response payload").isNull();
     }
 
     @Test
     public void testNewErrorResponseWithMessage() {
-        final org.hyperledger.fabric.shim.Chaincode.Response response = ResponseUtils.newErrorResponse("Simple message");
-        assertThat(response.getStatus()).as("Response status").isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.INTERNAL_SERVER_ERROR);
+        final org.hyperledger.fabric.shim.Chaincode.Response response =
+                ResponseUtils.newErrorResponse("Simple message");
+        assertThat(response.getStatus())
+                .as("Response status")
+                .isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.INTERNAL_SERVER_ERROR);
         assertThat(response.getMessage()).as("Response message").isEqualTo("Simple message");
         assertThat(response.getPayload()).as("Response payload").isNull();
     }
 
     @Test
     public void testNewErrorResponseWithPayload() {
-        final org.hyperledger.fabric.shim.Chaincode.Response response = ResponseUtils.newErrorResponse("Simple payload".getBytes(Charset.defaultCharset()));
-        assertThat(response.getStatus()).as("Response status").isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.INTERNAL_SERVER_ERROR);
+        final org.hyperledger.fabric.shim.Chaincode.Response response =
+                ResponseUtils.newErrorResponse("Simple payload".getBytes(Charset.defaultCharset()));
+        assertThat(response.getStatus())
+                .as("Response status")
+                .isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.INTERNAL_SERVER_ERROR);
         assertThat(response.getMessage()).as("Response message").isNull();
-        assertThat(response.getPayload()).as("Response payload").isEqualTo("Simple payload".getBytes(Charset.defaultCharset()));
+        assertThat(response.getPayload())
+                .as("Response payload")
+                .isEqualTo("Simple payload".getBytes(Charset.defaultCharset()));
     }
 
     @Test
     public void testNewErrorResponseWithMessageAndPayload() {
-        final org.hyperledger.fabric.shim.Chaincode.Response response = ResponseUtils.newErrorResponse("Simple message",
-                "Simple payload".getBytes(Charset.defaultCharset()));
-        assertThat(response.getStatus()).as("Response status").isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.INTERNAL_SERVER_ERROR);
+        final org.hyperledger.fabric.shim.Chaincode.Response response =
+                ResponseUtils.newErrorResponse("Simple message", "Simple payload".getBytes(Charset.defaultCharset()));
+        assertThat(response.getStatus())
+                .as("Response status")
+                .isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.INTERNAL_SERVER_ERROR);
         assertThat(response.getMessage()).as("Response message").isEqualTo("Simple message");
-        assertThat(response.getPayload()).as("Response payload").isEqualTo("Simple payload".getBytes(Charset.defaultCharset()));
+        assertThat(response.getPayload())
+                .as("Response payload")
+                .isEqualTo("Simple payload".getBytes(Charset.defaultCharset()));
     }
 
     @Test
     public void testNewErrorResponseWithException() {
-        final org.hyperledger.fabric.shim.Chaincode.Response response = ResponseUtils.newErrorResponse(new Exception("Simple exception"));
-        assertThat(response.getStatus()).as("Response status").isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.INTERNAL_SERVER_ERROR);
+        final org.hyperledger.fabric.shim.Chaincode.Response response =
+                ResponseUtils.newErrorResponse(new Exception("Simple exception"));
+        assertThat(response.getStatus())
+                .as("Response status")
+                .isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.INTERNAL_SERVER_ERROR);
         assertThat(response.getMessage()).as("Response message").isEqualTo("Unexpected error");
         assertThat(response.getPayload()).as("Response payload").isNull();
     }
 
     @Test
     public void testNewErrorResponseWithChaincodeException() {
-        final org.hyperledger.fabric.shim.Chaincode.Response response = ResponseUtils.newErrorResponse(new ChaincodeException("Chaincode exception"));
-        assertThat(response.getStatus()).as("Response status").isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.INTERNAL_SERVER_ERROR);
+        final org.hyperledger.fabric.shim.Chaincode.Response response =
+                ResponseUtils.newErrorResponse(new ChaincodeException("Chaincode exception"));
+        assertThat(response.getStatus())
+                .as("Response status")
+                .isEqualTo(org.hyperledger.fabric.shim.Chaincode.Response.Status.INTERNAL_SERVER_ERROR);
         assertThat(response.getMessage()).as("Response message").isEqualTo("Chaincode exception");
         assertThat(response.getPayload()).as("Response payload").isNull();
     }
@@ -273,11 +306,15 @@ public void testStartFailsWithoutValidOptions() {
         String msg = lr.getMessage();
 
         assertThat(msg).doesNotContain("java.lang.NullPointerException");
-        assertThat(msg).contains(
-            "The chaincode id must be specified using either the -i or --i command line options or the CORE_CHAINCODE_ID_NAME environment variable.");
+        assertThat(msg)
+                .contains(
+                        "The chaincode id must be specified using either the -i or --i command line options or the CORE_CHAINCODE_ID_NAME environment variable.");
     }
 
-    public static void setLogLevelForChaincode(final EnvironmentVariables environmentVariables, final ChaincodeBase cb, final String shimLevel,
+    public static void setLogLevelForChaincode(
+            final EnvironmentVariables environmentVariables,
+            final ChaincodeBase cb,
+            final String shimLevel,
             final String chaincodeLevel) {
         environmentVariables.set(ChaincodeBase.CORE_CHAINCODE_LOGGING_SHIM, shimLevel);
         environmentVariables.set(ChaincodeBase.CORE_CHAINCODE_LOGGING_LEVEL, chaincodeLevel);
@@ -302,19 +339,13 @@ public void connectChaincodeBase() throws IOException {
 
         cb.connectToPeer(new StreamObserver() {
             @Override
-            public void onNext(final ChaincodeMessage value) {
-
-            }
+            public void onNext(final ChaincodeMessage value) {}
 
             @Override
-            public void onError(final Throwable t) {
-
-            }
+            public void onError(final Throwable t) {}
 
             @Override
-            public void onCompleted() {
-
-            }
+            public void onCompleted() {}
         });
 
         environmentVariables.remove("CORE_CHAINCODE_ID_NAME");
@@ -324,12 +355,9 @@ public void onCompleted() {
 
     @Test
     public void connectChaincodeBaseNull() {
-        Assertions.assertThrows(
-                IllegalArgumentException.class,
-                () -> {
-                    final ChaincodeBase cb = new EmptyChaincode();
-                    cb.connectToPeer(null);
-                }
-        );
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            final ChaincodeBase cb = new EmptyChaincode();
+            cb.connectToPeer(null);
+        });
     }
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeServerImplTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeServerImplTest.java
index 8b52bbfd..3ab40706 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeServerImplTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeServerImplTest.java
@@ -5,6 +5,8 @@
  */
 package org.hyperledger.fabric.shim;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
 import org.hyperledger.fabric.contract.ContractRouter;
 import org.hyperledger.fabric.shim.chaincode.EmptyChaincode;
 import org.junit.jupiter.api.AfterEach;
@@ -15,9 +17,6 @@
 import uk.org.webcompere.systemstubs.jupiter.SystemStub;
 import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-
 @ExtendWith(SystemStubsExtension.class)
 class ChaincodeServerImplTest {
     @SystemStub
@@ -49,7 +48,8 @@ void clearEnv() {
     void init() {
         try {
             final ChaincodeBase chaincodeBase = new EmptyChaincode();
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
+            ChaincodeServer chaincodeServer =
+                    new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -60,7 +60,8 @@ void initEnvNotSet() {
         clearEnv();
         try {
             final ChaincodeBase chaincodeBase = new EmptyChaincode();
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
+            ChaincodeServer chaincodeServer =
+                    new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -69,16 +70,18 @@ void initEnvNotSet() {
     @Test
     void startAndStop() {
         try {
-            final ChaincodeBase chaincodeBase = new ContractRouter(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
+            final ChaincodeBase chaincodeBase =
+                    new ContractRouter(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
+            ChaincodeServer chaincodeServer =
+                    new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
             new Thread(() -> {
-                try {
-                    chaincodeServer.start();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-            ).start();
+                        try {
+                            chaincodeServer.start();
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    })
+                    .start();
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeStubTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeStubTest.java
index 37b8db4d..ccf3185a 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeStubTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeStubTest.java
@@ -9,7 +9,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeEvent;
 import org.hyperledger.fabric.protos.peer.SignedProposal;
 import org.hyperledger.fabric.shim.Chaincode.Response;
@@ -102,8 +101,8 @@ public QueryResultsIterator getStateByRange(final String startKey, fin
         }
 
         @Override
-        public QueryResultsIteratorWithMetadata getStateByRangeWithPagination(final String startKey, final String endKey, final int pageSize,
-                final String bookmark) {
+        public QueryResultsIteratorWithMetadata getStateByRangeWithPagination(
+                final String startKey, final String endKey, final int pageSize, final String bookmark) {
             // TODO Auto-generated method stub
             return null;
         }
@@ -115,7 +114,8 @@ public QueryResultsIterator getStateByPartialCompositeKey(final String
         }
 
         @Override
-        public QueryResultsIterator getStateByPartialCompositeKey(final String objectType, final String... attributes) {
+        public QueryResultsIterator getStateByPartialCompositeKey(
+                final String objectType, final String... attributes) {
             // TODO Auto-generated method stub
             return null;
         }
@@ -127,8 +127,8 @@ public QueryResultsIterator getStateByPartialCompositeKey(final Compos
         }
 
         @Override
-        public QueryResultsIteratorWithMetadata getStateByPartialCompositeKeyWithPagination(final CompositeKey compositeKey, final int pageSize,
-                final String bookmark) {
+        public QueryResultsIteratorWithMetadata getStateByPartialCompositeKeyWithPagination(
+                final CompositeKey compositeKey, final int pageSize, final String bookmark) {
             // TODO Auto-generated method stub
             return null;
         }
@@ -152,7 +152,8 @@ public QueryResultsIterator getQueryResult(final String query) {
         }
 
         @Override
-        public QueryResultsIteratorWithMetadata getQueryResultWithPagination(final String query, final int pageSize, final String bookmark) {
+        public QueryResultsIteratorWithMetadata getQueryResultWithPagination(
+                final String query, final int pageSize, final String bookmark) {
             // TODO Auto-generated method stub
             return null;
         }
@@ -205,26 +206,29 @@ public void purgePrivateData(final String collection, final String key) {
         }
 
         @Override
-        public QueryResultsIterator getPrivateDataByRange(final String collection, final String startKey, final String endKey) {
+        public QueryResultsIterator getPrivateDataByRange(
+                final String collection, final String startKey, final String endKey) {
             // TODO Auto-generated method stub
             return null;
         }
 
         @Override
-        public QueryResultsIterator getPrivateDataByPartialCompositeKey(final String collection, final String compositeKey) {
+        public QueryResultsIterator getPrivateDataByPartialCompositeKey(
+                final String collection, final String compositeKey) {
             // TODO Auto-generated method stub
             return null;
         }
 
         @Override
-        public QueryResultsIterator getPrivateDataByPartialCompositeKey(final String collection, final CompositeKey compositeKey) {
+        public QueryResultsIterator getPrivateDataByPartialCompositeKey(
+                final String collection, final CompositeKey compositeKey) {
             // TODO Auto-generated method stub
             return null;
         }
 
         @Override
-        public QueryResultsIterator getPrivateDataByPartialCompositeKey(final String collection, final String objectType,
-                final String... attributes) {
+        public QueryResultsIterator getPrivateDataByPartialCompositeKey(
+                final String collection, final String objectType, final String... attributes) {
             // TODO Auto-generated method stub
             return null;
         }
@@ -282,7 +286,6 @@ public String getMspId() {
             // TODO Auto-generated method stub
             return null;
         }
-
     }
 
     @Test
@@ -300,5 +303,4 @@ public void testDefaultMethods() {
         stub.getPrivateDataUTF8("collection", "key");
         stub.putStringState("key", "value");
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeTest.java
index 800ec670..7b70b388 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeTest.java
@@ -5,17 +5,17 @@
  */
 package org.hyperledger.fabric.shim;
 
-import org.junit.jupiter.api.Test;
-
-import java.nio.charset.StandardCharsets;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import java.nio.charset.StandardCharsets;
+import org.junit.jupiter.api.Test;
+
 public class ChaincodeTest {
     @Test
     public void testResponse() {
-        final Chaincode.Response resp = new Chaincode.Response(Chaincode.Response.Status.SUCCESS, "No message", "no payload".getBytes(StandardCharsets.UTF_8));
+        final Chaincode.Response resp = new Chaincode.Response(
+                Chaincode.Response.Status.SUCCESS, "No message", "no payload".getBytes(StandardCharsets.UTF_8));
         assertThat(Chaincode.Response.Status.SUCCESS).as("Incorrect status").isEqualTo(resp.getStatus());
         assertThat("No message").as("Incorrect message").isEqualTo(resp.getMessage());
         assertThat("no payload").as("Incorrect payload").isEqualTo(resp.getStringPayload());
@@ -23,7 +23,8 @@ public void testResponse() {
 
     @Test
     public void testResponseWithCode() {
-        Chaincode.Response resp = new Chaincode.Response(200, "No message", "no payload".getBytes(StandardCharsets.UTF_8));
+        Chaincode.Response resp =
+                new Chaincode.Response(200, "No message", "no payload".getBytes(StandardCharsets.UTF_8));
         assertThat(Chaincode.Response.Status.SUCCESS).as("Incorrect status").isEqualTo(resp.getStatus());
         assertThat(200).as("Incorrect status").isEqualTo(resp.getStatusCode());
         assertThat("No message").as("Incorrect message").isEqualTo(resp.getMessage());
@@ -34,8 +35,11 @@ public void testResponseWithCode() {
         assertThat("No message").as("Incorrect message").isEqualTo(resp.getMessage());
         assertThat("no payload").as("Incorrect payload").isEqualTo(resp.getStringPayload());
 
-        resp = new Chaincode.Response(Chaincode.Response.Status.ERROR_THRESHOLD, "No message", "no payload".getBytes(StandardCharsets.UTF_8));
-        assertThat(Chaincode.Response.Status.ERROR_THRESHOLD).as("Incorrect status").isEqualTo(resp.getStatus());
+        resp = new Chaincode.Response(
+                Chaincode.Response.Status.ERROR_THRESHOLD, "No message", "no payload".getBytes(StandardCharsets.UTF_8));
+        assertThat(Chaincode.Response.Status.ERROR_THRESHOLD)
+                .as("Incorrect status")
+                .isEqualTo(resp.getStatus());
         assertThat(400).as("Incorrect status").isEqualTo(resp.getStatusCode());
         assertThat("No message").as("Incorrect message").isEqualTo(resp.getMessage());
         assertThat("no payload").as("Incorrect payload").isEqualTo(resp.getStringPayload());
@@ -43,11 +47,16 @@ public void testResponseWithCode() {
 
     @Test
     public void testStatus() {
-        assertThat(Chaincode.Response.Status.SUCCESS).as("Wrong status").isEqualTo(Chaincode.Response.Status.forCode(200));
-        assertThat(Chaincode.Response.Status.ERROR_THRESHOLD).as("Wrong status").isEqualTo(Chaincode.Response.Status.forCode(400));
-        assertThat(Chaincode.Response.Status.INTERNAL_SERVER_ERROR).as("Wrong status").isEqualTo(Chaincode.Response.Status.forCode(500));
-
-        assertThatThrownBy(() -> Chaincode.Response.Status.forCode(501))
-                .isInstanceOf(IllegalArgumentException.class);
+        assertThat(Chaincode.Response.Status.SUCCESS)
+                .as("Wrong status")
+                .isEqualTo(Chaincode.Response.Status.forCode(200));
+        assertThat(Chaincode.Response.Status.ERROR_THRESHOLD)
+                .as("Wrong status")
+                .isEqualTo(Chaincode.Response.Status.forCode(400));
+        assertThat(Chaincode.Response.Status.INTERNAL_SERVER_ERROR)
+                .as("Wrong status")
+                .isEqualTo(Chaincode.Response.Status.forCode(500));
+
+        assertThatThrownBy(() -> Chaincode.Response.Status.forCode(501)).isInstanceOf(IllegalArgumentException.class);
     }
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChatChaincodeWithPeerTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChatChaincodeWithPeerTest.java
index 5e7108f3..d3832502 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChatChaincodeWithPeerTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChatChaincodeWithPeerTest.java
@@ -5,8 +5,25 @@
  */
 package org.hyperledger.fabric.shim;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.stream.Collectors.toList;
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.INIT;
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.INVOKE_CHAINCODE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import com.google.protobuf.ByteString;
 import io.grpc.stub.StreamObserver;
+import java.io.IOException;
+import java.util.List;
+import java.util.Properties;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.hyperledger.fabric.metrics.Metrics;
 import org.hyperledger.fabric.protos.peer.ChaincodeID;
 import org.hyperledger.fabric.protos.peer.ChaincodeInput;
@@ -24,27 +41,10 @@
 import uk.org.webcompere.systemstubs.jupiter.SystemStub;
 import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Properties;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.stream.Collectors.toList;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.INIT;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.INVOKE_CHAINCODE;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 @ExtendWith(SystemStubsExtension.class)
 class ChatChaincodeWithPeerTest {
     private static final String TEST_CHANNEL = "testChannel";
+
     @SystemStub
     private final EnvironmentVariables environmentVariables = new EnvironmentVariables();
 
@@ -75,8 +75,7 @@ void initNull() throws IOException {
                 () -> {
                     ChatChaincodeWithPeer chatChaincodeWithPeer = new ChatChaincodeWithPeer(null);
                 },
-                "chaincodeBase can't be null"
-        );
+                "chaincodeBase can't be null");
     }
 
     @Test
@@ -112,21 +111,17 @@ void initEmptyId() throws IOException {
                     Traces.initialize(props);
                     ChatChaincodeWithPeer chatChaincodeWithPeer = new ChatChaincodeWithPeer(chaincodeBase);
                 },
-                "chaincode id not set, set env 'CORE_CHAINCODE_ID_NAME', for example 'CORE_CHAINCODE_ID_NAME=mycc'"
-        );
+                "chaincode id not set, set env 'CORE_CHAINCODE_ID_NAME', for example 'CORE_CHAINCODE_ID_NAME=mycc'");
     }
 
     @Test
     void connectEnvNotSet() throws IOException {
         clearEnv();
 
-        Assertions.assertThrows(
-                IllegalArgumentException.class,
-                () -> {
-                    ChaincodeBase chaincodeBase = new EmptyChaincode();
-                    ChatChaincodeWithPeer chatChaincodeWithPeer = new ChatChaincodeWithPeer(chaincodeBase);
-                }
-        );
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            ChaincodeBase chaincodeBase = new EmptyChaincode();
+            ChatChaincodeWithPeer chatChaincodeWithPeer = new ChatChaincodeWithPeer(chaincodeBase);
+        });
     }
 
     @Test
@@ -154,41 +149,50 @@ void connectAndReceiveRegister() throws IOException {
         Metrics.initialize(props);
 
         ChatChaincodeWithPeer chatChaincodeWithPeer = new ChatChaincodeWithPeer(chaincodeBase);
-        final StreamObserver connect = chatChaincodeWithPeer.connect(new StreamObserver() {
-            @Override
-            public void onNext(final ChaincodeMessage value) {
-                assertEquals(ChaincodeMessage.Type.REGISTER, value.getType());
-                assertEquals("\u0012\u0004mycc", value.getPayload().toStringUtf8());
-            }
-
-            @Override
-            public void onError(final Throwable t) {
-                assertNull(t);
-            }
-
-            @Override
-            public void onCompleted() {
-            }
-        });
+        final StreamObserver connect =
+                chatChaincodeWithPeer.connect(new StreamObserver() {
+                    @Override
+                    public void onNext(final ChaincodeMessage value) {
+                        assertEquals(ChaincodeMessage.Type.REGISTER, value.getType());
+                        assertEquals("\u0012\u0004mycc", value.getPayload().toStringUtf8());
+                    }
+
+                    @Override
+                    public void onError(final Throwable t) {
+                        assertNull(t);
+                    }
+
+                    @Override
+                    public void onCompleted() {}
+                });
         assertNotNull(connect);
 
         final ByteString payload = org.hyperledger.fabric.protos.peer.ChaincodeInput.newBuilder()
-                .addArgs(ByteString.copyFromUtf8("")).build()
+                .addArgs(ByteString.copyFromUtf8(""))
+                .build()
                 .toByteString();
         final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, TEST_CHANNEL, "0", payload, null);
         connect.onNext(initMsg);
 
         try {
-            final List args = Stream.of("invoke", "a", "1").map(x -> x.getBytes(UTF_8)).collect(toList());
+            final List args =
+                    Stream.of("invoke", "a", "1").map(x -> x.getBytes(UTF_8)).collect(toList());
             final ByteString invocationSpecPayload = ChaincodeSpec.newBuilder()
-                    .setChaincodeId(ChaincodeID.newBuilder().setName(chaincodeBase.getId()).build())
-                    .setInput(ChaincodeInput.newBuilder().addAllArgs(args.stream().map(ByteString::copyFrom)
-                            .collect(Collectors.toList())).build()).build()
+                    .setChaincodeId(ChaincodeID.newBuilder()
+                            .setName(chaincodeBase.getId())
+                            .build())
+                    .setInput(ChaincodeInput.newBuilder()
+                            .addAllArgs(args.stream().map(ByteString::copyFrom).collect(Collectors.toList()))
+                            .build())
+                    .build()
                     .toByteString();
 
             final ChaincodeMessage invokeChaincodeMessage = ChaincodeMessage.newBuilder()
-                    .setType(INVOKE_CHAINCODE).setChannelId(TEST_CHANNEL)
-                    .setTxid("1").setPayload(invocationSpecPayload).build();
+                    .setType(INVOKE_CHAINCODE)
+                    .setChannelId(TEST_CHANNEL)
+                    .setTxid("1")
+                    .setPayload(invocationSpecPayload)
+                    .build();
             connect.onNext(invokeChaincodeMessage);
             System.out.println(invokeChaincodeMessage.getPayload().toStringUtf8());
         } catch (Exception e) {
@@ -196,16 +200,24 @@ public void onCompleted() {
         }
 
         try {
-            final List args = Stream.of("invoke", "a", "1").map(x -> x.getBytes(UTF_8)).collect(toList());
+            final List args =
+                    Stream.of("invoke", "a", "1").map(x -> x.getBytes(UTF_8)).collect(toList());
             final ByteString invocationSpecPayload = ChaincodeSpec.newBuilder()
-                    .setChaincodeId(ChaincodeID.newBuilder().setName(chaincodeBase.getId()).build())
-                    .setInput(ChaincodeInput.newBuilder().addAllArgs(args.stream().map(ByteString::copyFrom)
-                            .collect(Collectors.toList())).build()).build()
+                    .setChaincodeId(ChaincodeID.newBuilder()
+                            .setName(chaincodeBase.getId())
+                            .build())
+                    .setInput(ChaincodeInput.newBuilder()
+                            .addAllArgs(args.stream().map(ByteString::copyFrom).collect(Collectors.toList()))
+                            .build())
+                    .build()
                     .toByteString();
 
             final ChaincodeMessage invokeChaincodeMessage = ChaincodeMessage.newBuilder()
-                    .setType(INVOKE_CHAINCODE).setChannelId(TEST_CHANNEL)
-                    .setTxid("2").setPayload(invocationSpecPayload).build();
+                    .setType(INVOKE_CHAINCODE)
+                    .setChannelId(TEST_CHANNEL)
+                    .setTxid("2")
+                    .setPayload(invocationSpecPayload)
+                    .build();
             connect.onNext(invokeChaincodeMessage);
             System.out.println(invokeChaincodeMessage.getPayload().toStringUtf8());
         } catch (Exception e) {
@@ -225,22 +237,22 @@ void connectAndReceiveRegisterComplete() throws IOException {
         Metrics.initialize(props);
 
         ChatChaincodeWithPeer chatChaincodeWithPeer = new ChatChaincodeWithPeer(chaincodeBase);
-        final StreamObserver connect = chatChaincodeWithPeer.connect(new StreamObserver() {
-            @Override
-            public void onNext(final ChaincodeMessage value) {
-                assertEquals(ChaincodeMessage.Type.REGISTER, value.getType());
-                assertEquals("\u0012\u0004mycc", value.getPayload().toStringUtf8());
-            }
-
-            @Override
-            public void onError(final Throwable t) {
-                assertNull(t);
-            }
-
-            @Override
-            public void onCompleted() {
-            }
-        });
+        final StreamObserver connect =
+                chatChaincodeWithPeer.connect(new StreamObserver() {
+                    @Override
+                    public void onNext(final ChaincodeMessage value) {
+                        assertEquals(ChaincodeMessage.Type.REGISTER, value.getType());
+                        assertEquals("\u0012\u0004mycc", value.getPayload().toStringUtf8());
+                    }
+
+                    @Override
+                    public void onError(final Throwable t) {
+                        assertNull(t);
+                    }
+
+                    @Override
+                    public void onCompleted() {}
+                });
         connect.onCompleted();
     }
 
@@ -256,19 +268,17 @@ void connectAndReceiveRegisterException() throws IOException {
         Metrics.initialize(props);
 
         ChatChaincodeWithPeer chatChaincodeWithPeer = new ChatChaincodeWithPeer(chaincodeBase);
-        final StreamObserver connect = chatChaincodeWithPeer.connect(new StreamObserver() {
-            @Override
-            public void onNext(final ChaincodeMessage value) {
-            }
+        final StreamObserver connect =
+                chatChaincodeWithPeer.connect(new StreamObserver() {
+                    @Override
+                    public void onNext(final ChaincodeMessage value) {}
 
-            @Override
-            public void onError(final Throwable t) {
-            }
+                    @Override
+                    public void onError(final Throwable t) {}
 
-            @Override
-            public void onCompleted() {
-            }
-        });
+                    @Override
+                    public void onCompleted() {}
+                });
         connect.onError(new Exception("some_error"));
     }
 
@@ -287,24 +297,21 @@ void connectOnCompletedException() throws IOException {
 
         Assertions.assertDoesNotThrow(
                 () -> {
-                    final StreamObserver connect = chatChaincodeWithPeer
-                            .connect(new StreamObserver() {
-                        @Override
-                        public void onNext(final ChaincodeMessage value) {
-                        }
-
-                        @Override
-                        public void onError(final Throwable t) {
-                        }
-
-                        @Override
-                        public void onCompleted() {
-                            throw new RuntimeException("some_error");
-                        }
-                    });
+                    final StreamObserver connect =
+                            chatChaincodeWithPeer.connect(new StreamObserver() {
+                                @Override
+                                public void onNext(final ChaincodeMessage value) {}
+
+                                @Override
+                                public void onError(final Throwable t) {}
+
+                                @Override
+                                public void onCompleted() {
+                                    throw new RuntimeException("some_error");
+                                }
+                            });
                 },
-                "some_error"
-        );
+                "some_error");
     }
 
     @Test
@@ -318,16 +325,13 @@ void testMockChaincodeBase() throws IOException {
 
         assertNull(chatChaincodeWithPeer.connect(new StreamObserver() {
             @Override
-            public void onNext(final ChaincodeMessage value) {
-            }
+            public void onNext(final ChaincodeMessage value) {}
 
             @Override
-            public void onError(final Throwable t) {
-            }
+            public void onError(final Throwable t) {}
 
             @Override
-            public void onCompleted() {
-            }
+            public void onCompleted() {}
         }));
     }
 
@@ -344,8 +348,7 @@ void testMockChaincodeBaseThrowIOException() throws IOException {
 
         assertNull(chatChaincodeWithPeer.connect(new StreamObserver() {
             @Override
-            public void onNext(final ChaincodeMessage value) {
-            }
+            public void onNext(final ChaincodeMessage value) {}
 
             @Override
             public void onError(final Throwable t) {
@@ -353,8 +356,7 @@ public void onError(final Throwable t) {
             }
 
             @Override
-            public void onCompleted() {
-            }
+            public void onCompleted() {}
         }));
     }
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/NettyGrpcServerTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/NettyGrpcServerTest.java
index c14163e7..87e8474e 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/NettyGrpcServerTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/NettyGrpcServerTest.java
@@ -5,6 +5,9 @@
  */
 package org.hyperledger.fabric.shim;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.Properties;
 import org.hyperledger.fabric.metrics.Metrics;
 import org.hyperledger.fabric.shim.chaincode.EmptyChaincode;
 import org.hyperledger.fabric.traces.Traces;
@@ -17,10 +20,6 @@
 import uk.org.webcompere.systemstubs.jupiter.SystemStub;
 import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.Properties;
-
 @ExtendWith(SystemStubsExtension.class)
 class NettyGrpcServerTest {
     @SystemStub
@@ -53,7 +52,8 @@ void initNoTls() {
         try {
             final ChaincodeBase chaincodeBase = new EmptyChaincode();
             chaincodeBase.processEnvironmentOptions();
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
+            ChaincodeServer chaincodeServer =
+                    new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
         } catch (IOException | URISyntaxException e) {
             e.printStackTrace();
         }
@@ -61,100 +61,138 @@ void initNoTls() {
 
     @Test
     void validationNoChaincodeServerPropertiesg() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> {
-            final ChaincodeBase chaincodeBase = new EmptyChaincode();
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, null);
-        }, "ChaincodeServerProperties must be specified");
+        Assertions.assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    final ChaincodeBase chaincodeBase = new EmptyChaincode();
+                    ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, null);
+                },
+                "ChaincodeServerProperties must be specified");
     }
 
     @Test
     void validationPortChaincodeServer() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> {
-            final ChaincodeBase chaincodeBase = new EmptyChaincode();
-            final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
-            chaincodeServerProperties.setServerAddress(null);
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
-        }, "ChaincodeServerProperties.getServerAddress() must be set");
+        Assertions.assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    final ChaincodeBase chaincodeBase = new EmptyChaincode();
+                    final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
+                    chaincodeServerProperties.setServerAddress(null);
+                    ChaincodeServer chaincodeServer =
+                            new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
+                },
+                "ChaincodeServerProperties.getServerAddress() must be set");
     }
 
     @Test
     void validationKeepAliveTimeMinutes() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> {
-            final ChaincodeBase chaincodeBase = new EmptyChaincode();
-            final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
-            chaincodeServerProperties.setKeepAliveTimeMinutes(-1);
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
-        }, "ChaincodeServerProperties.getKeepAliveTimeMinutes() must be more then 0");
+        Assertions.assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    final ChaincodeBase chaincodeBase = new EmptyChaincode();
+                    final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
+                    chaincodeServerProperties.setKeepAliveTimeMinutes(-1);
+                    ChaincodeServer chaincodeServer =
+                            new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
+                },
+                "ChaincodeServerProperties.getKeepAliveTimeMinutes() must be more then 0");
     }
 
     @Test
     void validationKeepAliveTimeoutSeconds() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> {
-            final ChaincodeBase chaincodeBase = new EmptyChaincode();
-            final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
-            chaincodeServerProperties.setKeepAliveTimeoutSeconds(-1);
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
-        }, "ChaincodeServerProperties.getKeepAliveTimeoutSeconds() must be more then 0");
+        Assertions.assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    final ChaincodeBase chaincodeBase = new EmptyChaincode();
+                    final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
+                    chaincodeServerProperties.setKeepAliveTimeoutSeconds(-1);
+                    ChaincodeServer chaincodeServer =
+                            new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
+                },
+                "ChaincodeServerProperties.getKeepAliveTimeoutSeconds() must be more then 0");
     }
 
     @Test
     void validationPermitKeepAliveTimeMinutes() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> {
-            final ChaincodeBase chaincodeBase = new EmptyChaincode();
-            final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
-            chaincodeServerProperties.setPermitKeepAliveTimeMinutes(-1);
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
-        }, "ChaincodeServerProperties.getPermitKeepAliveTimeMinutes() must be more then 0");
+        Assertions.assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    final ChaincodeBase chaincodeBase = new EmptyChaincode();
+                    final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
+                    chaincodeServerProperties.setPermitKeepAliveTimeMinutes(-1);
+                    ChaincodeServer chaincodeServer =
+                            new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
+                },
+                "ChaincodeServerProperties.getPermitKeepAliveTimeMinutes() must be more then 0");
     }
 
     @Test
     void validationMaxConnectionAgeSeconds() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> {
-            final ChaincodeBase chaincodeBase = new EmptyChaincode();
-            final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
-            chaincodeServerProperties.setMaxConnectionAgeSeconds(-1);
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
-        }, "ChaincodeServerProperties.getMaxConnectionAgeSeconds() must be more then 0");
+        Assertions.assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    final ChaincodeBase chaincodeBase = new EmptyChaincode();
+                    final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
+                    chaincodeServerProperties.setMaxConnectionAgeSeconds(-1);
+                    ChaincodeServer chaincodeServer =
+                            new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
+                },
+                "ChaincodeServerProperties.getMaxConnectionAgeSeconds() must be more then 0");
     }
 
     @Test
     void validationMaxInboundMetadataSize() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> {
-            final ChaincodeBase chaincodeBase = new EmptyChaincode();
-            final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
-            chaincodeServerProperties.setMaxInboundMetadataSize(-1);
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
-        }, "ChaincodeServerProperties.getMaxInboundMetadataSize() must be more then 0");
+        Assertions.assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    final ChaincodeBase chaincodeBase = new EmptyChaincode();
+                    final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
+                    chaincodeServerProperties.setMaxInboundMetadataSize(-1);
+                    ChaincodeServer chaincodeServer =
+                            new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
+                },
+                "ChaincodeServerProperties.getMaxInboundMetadataSize() must be more then 0");
     }
 
     @Test
     void validationMaxInboundMessageSize() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> {
-            final ChaincodeBase chaincodeBase = new EmptyChaincode();
-            final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
-            chaincodeServerProperties.setMaxInboundMessageSize(-1);
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
-        }, "ChaincodeServerProperties.getMaxInboundMessageSize() must be more then 0");
+        Assertions.assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    final ChaincodeBase chaincodeBase = new EmptyChaincode();
+                    final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
+                    chaincodeServerProperties.setMaxInboundMessageSize(-1);
+                    ChaincodeServer chaincodeServer =
+                            new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
+                },
+                "ChaincodeServerProperties.getMaxInboundMessageSize() must be more then 0");
     }
 
     @Test
     void validationTlsEnabledButKeyNotSet() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> {
-            final ChaincodeBase chaincodeBase = new EmptyChaincode();
-            final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
-            chaincodeServerProperties.setTlsEnabled(true);
-            chaincodeServerProperties.setKeyFile(null);
-            chaincodeServerProperties.setKeyCertChainFile(null);
-            chaincodeServerProperties.setKeyPassword(null);
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
-        }, "ChaincodeServerProperties.getMaxInboundMessageSize() must be more then 0");
+        Assertions.assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    final ChaincodeBase chaincodeBase = new EmptyChaincode();
+                    final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
+                    chaincodeServerProperties.setTlsEnabled(true);
+                    chaincodeServerProperties.setKeyFile(null);
+                    chaincodeServerProperties.setKeyCertChainFile(null);
+                    chaincodeServerProperties.setKeyPassword(null);
+                    ChaincodeServer chaincodeServer =
+                            new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
+                },
+                "ChaincodeServerProperties.getMaxInboundMessageSize() must be more then 0");
     }
 
     @Test
     void initNull() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> {
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(null, new ChaincodeServerProperties());
-        }, "chaincode must be specified");
+        Assertions.assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    ChaincodeServer chaincodeServer = new NettyChaincodeServer(null, new ChaincodeServerProperties());
+                },
+                "chaincode must be specified");
     }
 
     @Test
@@ -163,7 +201,6 @@ void initNullEnvNotSet() {
         Assertions.assertThrows(IllegalArgumentException.class, () -> {
             ChaincodeServer chaincodeServer = new NettyChaincodeServer(null, new ChaincodeServerProperties());
         });
-
     }
 
     @Test
@@ -187,8 +224,8 @@ void initEnvSetPortChaincodeServerAndCoreChaincodeIdName() throws IOException, U
         Metrics.initialize(props);
         Traces.initialize(props);
 
-        ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
-
+        ChaincodeServer chaincodeServer =
+                new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
     }
 
     @Test
@@ -203,14 +240,16 @@ void startAndStopSetCoreChaincodeIdName() {
             Metrics.initialize(props);
             Traces.initialize(props);
 
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
+            ChaincodeServer chaincodeServer =
+                    new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
             new Thread(() -> {
-                try {
-                    chaincodeServer.start();
-                } catch (IOException | InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }).start();
+                        try {
+                            chaincodeServer.start();
+                        } catch (IOException | InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    })
+                    .start();
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
@@ -218,7 +257,7 @@ void startAndStopSetCoreChaincodeIdName() {
             }
 
             chaincodeServer.stop();
-        } catch (IOException | URISyntaxException  e) {
+        } catch (IOException | URISyntaxException e) {
             e.printStackTrace();
         }
     }
@@ -228,14 +267,16 @@ void startAndStop() {
         try {
             final ChaincodeBase chaincodeBase = new EmptyChaincode();
             chaincodeBase.processEnvironmentOptions();
-            ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
+            ChaincodeServer chaincodeServer =
+                    new NettyChaincodeServer(chaincodeBase, chaincodeBase.getChaincodeServerConfig());
             new Thread(() -> {
-                try {
-                    chaincodeServer.start();
-                } catch (IOException | InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }).start();
+                        try {
+                            chaincodeServer.start();
+                        } catch (IOException | InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    })
+                    .start();
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
@@ -260,12 +301,13 @@ void startAndStopTlsPassword() {
             chaincodeServerProperties.setKeyPassword("test");
             ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
             new Thread(() -> {
-                try {
-                    chaincodeServer.start();
-                } catch (IOException | InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }).start();
+                        try {
+                            chaincodeServer.start();
+                        } catch (IOException | InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    })
+                    .start();
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
@@ -289,12 +331,13 @@ void startAndStopTlsWithoutPassword() {
             chaincodeServerProperties.setKeyCertChainFile("src/test/resources/client.crt");
             ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
             new Thread(() -> {
-                try {
-                    chaincodeServer.start();
-                } catch (IOException | InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }).start();
+                        try {
+                            chaincodeServer.start();
+                        } catch (IOException | InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    })
+                    .start();
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ext/sbe/StateBasedEndorsementTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ext/sbe/StateBasedEndorsementTest.java
index d1d23adb..3983ce57 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ext/sbe/StateBasedEndorsementTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ext/sbe/StateBasedEndorsementTest.java
@@ -5,19 +5,20 @@
  */
 package org.hyperledger.fabric.shim.ext.sbe;
 
-import org.junit.jupiter.api.Test;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import org.junit.jupiter.api.Test;
+
 public class StateBasedEndorsementTest {
     @Test
     public void testRoleType() {
-        assertThat(StateBasedEndorsement.RoleType.forVal("MEMBER")).isEqualTo(StateBasedEndorsement.RoleType.RoleTypeMember);
-        assertThat(StateBasedEndorsement.RoleType.forVal("PEER")).isEqualTo(StateBasedEndorsement.RoleType.RoleTypePeer);
+        assertThat(StateBasedEndorsement.RoleType.forVal("MEMBER"))
+                .isEqualTo(StateBasedEndorsement.RoleType.RoleTypeMember);
+        assertThat(StateBasedEndorsement.RoleType.forVal("PEER"))
+                .isEqualTo(StateBasedEndorsement.RoleType.RoleTypePeer);
 
         assertThatThrownBy(() -> StateBasedEndorsement.RoleType.forVal("NONEXIST"))
                 .isInstanceOf(IllegalArgumentException.class);
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementFactoryTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementFactoryTest.java
index 08896e60..750e24f0 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementFactoryTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementFactoryTest.java
@@ -5,12 +5,11 @@
  */
 package org.hyperledger.fabric.shim.ext.sbe.impl;
 
-import org.junit.jupiter.api.Test;
-
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.junit.jupiter.api.Test;
 
 public class StateBasedEndorsementFactoryTest {
     @Test
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementImplTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementImplTest.java
index 332fa347..195a672e 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementImplTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ext/sbe/impl/StateBasedEndorsementImplTest.java
@@ -5,13 +5,6 @@
  */
 package org.hyperledger.fabric.shim.ext.sbe.impl;
 
-import org.hyperledger.fabric.protos.common.MSPRole.MSPRoleType;
-import org.hyperledger.fabric.shim.ext.sbe.StateBasedEndorsement;
-import org.hyperledger.fabric.shim.ext.sbe.StateBasedEndorsement.RoleType;
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.hasSize;
@@ -21,26 +14,38 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.List;
+import org.hyperledger.fabric.protos.common.MSPRole.MSPRoleType;
+import org.hyperledger.fabric.shim.ext.sbe.StateBasedEndorsement;
+import org.hyperledger.fabric.shim.ext.sbe.StateBasedEndorsement.RoleType;
+import org.junit.jupiter.api.Test;
+
 public class StateBasedEndorsementImplTest {
 
     @Test
     public void addOrgs() {
         // add an org
-        final StateBasedEndorsement ep = StateBasedEndorsementFactory.getInstance().newStateBasedEndorsement(null);
+        final StateBasedEndorsement ep =
+                StateBasedEndorsementFactory.getInstance().newStateBasedEndorsement(null);
         ep.addOrgs(RoleType.RoleTypePeer, "Org1");
 
         final byte[] epBytes = ep.policy();
         assertThat(epBytes, is(not(nullValue())));
         assertTrue(epBytes.length > 0);
-        final byte[] expectedEPBytes = StateBasedEndorsementUtils.signedByFabricEntity("Org1", MSPRoleType.PEER).toByteString().toByteArray();
+        final byte[] expectedEPBytes = StateBasedEndorsementUtils.signedByFabricEntity("Org1", MSPRoleType.PEER)
+                .toByteString()
+                .toByteArray();
         assertArrayEquals(expectedEPBytes, epBytes);
     }
 
     @Test
     public void delOrgs() {
 
-        final byte[] initEPBytes = StateBasedEndorsementUtils.signedByFabricEntity("Org1", MSPRoleType.PEER).toByteString().toByteArray();
-        final StateBasedEndorsement ep = StateBasedEndorsementFactory.getInstance().newStateBasedEndorsement(initEPBytes);
+        final byte[] initEPBytes = StateBasedEndorsementUtils.signedByFabricEntity("Org1", MSPRoleType.PEER)
+                .toByteString()
+                .toByteArray();
+        final StateBasedEndorsement ep =
+                StateBasedEndorsementFactory.getInstance().newStateBasedEndorsement(initEPBytes);
         final List listOrgs = ep.listOrgs();
 
         assertThat(listOrgs, is(not(nullValue())));
@@ -54,14 +59,19 @@ public void delOrgs() {
 
         assertThat(epBytes, is(not(nullValue())));
         assertTrue(epBytes.length > 0);
-        final byte[] expectedEPBytes = StateBasedEndorsementUtils.signedByFabricEntity("Org2", MSPRoleType.MEMBER).toByteString().toByteArray();
+        final byte[] expectedEPBytes = StateBasedEndorsementUtils.signedByFabricEntity("Org2", MSPRoleType.MEMBER)
+                .toByteString()
+                .toByteArray();
         assertArrayEquals(expectedEPBytes, epBytes);
     }
 
     @Test
     public void listOrgs() {
-        final byte[] initEPBytes = StateBasedEndorsementUtils.signedByFabricEntity("Org1", MSPRoleType.PEER).toByteString().toByteArray();
-        final StateBasedEndorsement ep = StateBasedEndorsementFactory.getInstance().newStateBasedEndorsement(initEPBytes);
+        final byte[] initEPBytes = StateBasedEndorsementUtils.signedByFabricEntity("Org1", MSPRoleType.PEER)
+                .toByteString()
+                .toByteArray();
+        final StateBasedEndorsement ep =
+                StateBasedEndorsementFactory.getInstance().newStateBasedEndorsement(initEPBytes);
         final List listOrgs = ep.listOrgs();
 
         assertThat(listOrgs, is(not(nullValue())));
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/fvt/ChaincodeFVTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/fvt/ChaincodeFVTest.java
index 0ebd3c6b..490be49b 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/fvt/ChaincodeFVTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/fvt/ChaincodeFVTest.java
@@ -5,7 +5,25 @@
  */
 package org.hyperledger.fabric.shim.fvt;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.COMPLETED;
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.INIT;
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.READY;
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.REGISTER;
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.RESPONSE;
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.TRANSACTION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import com.google.protobuf.ByteString;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.hyperledger.fabric.protos.peer.ChaincodeInput;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.Response;
@@ -42,25 +60,6 @@
 import uk.org.webcompere.systemstubs.jupiter.SystemStub;
 import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.COMPLETED;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.INIT;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.READY;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.REGISTER;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.RESPONSE;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.TRANSACTION;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
 @ExtendWith(SystemStubsExtension.class)
 public final class ChaincodeFVTest {
 
@@ -86,7 +85,7 @@ public void testRegister() throws Exception {
 
         server = ChaincodeMockPeer.startServer(scenario);
 
-        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId" });
+        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
 
         ChaincodeMockPeer.checkScenarioStepEnded(server, 1, 5000, TimeUnit.MILLISECONDS);
 
@@ -109,9 +108,10 @@ public Response invoke(final ChaincodeStub stub) {
         };
 
         final ByteString payload = org.hyperledger.fabric.protos.peer.ChaincodeInput.newBuilder()
-                .addArgs(ByteString.copyFromUtf8("")).build().toByteString();
-        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0", payload,
-                null);
+                .addArgs(ByteString.copyFromUtf8(""))
+                .build()
+                .toByteString();
+        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0", payload, null);
 
         final List scenario = new ArrayList<>();
         scenario.add(new RegisterStep());
@@ -119,7 +119,7 @@ public Response invoke(final ChaincodeStub stub) {
 
         server = ChaincodeMockPeer.startServer(scenario);
 
-        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId" });
+        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         ChaincodeMockPeer.checkScenarioStepEnded(server, 1, 5000, TimeUnit.MILLISECONDS);
 
         server.send(initMsg);
@@ -153,10 +153,13 @@ public Response invoke(final ChaincodeStub stub) {
             }
         };
 
-        final ByteString initPayload = ChaincodeInput.newBuilder().addArgs(ByteString.copyFromUtf8("init"))
-                .addArgs(ByteString.copyFromUtf8("a")).addArgs(ByteString.copyFromUtf8("100")).build().toByteString();
-        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0",
-                initPayload, null);
+        final ByteString initPayload = ChaincodeInput.newBuilder()
+                .addArgs(ByteString.copyFromUtf8("init"))
+                .addArgs(ByteString.copyFromUtf8("a"))
+                .addArgs(ByteString.copyFromUtf8("100"))
+                .build()
+                .toByteString();
+        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0", initPayload, null);
 
         final List scenario = new ArrayList<>();
         scenario.add(new RegisterStep());
@@ -170,7 +173,7 @@ public Response invoke(final ChaincodeStub stub) {
         setLogLevel("DEBUG");
         server = ChaincodeMockPeer.startServer(scenario);
 
-        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId" });
+        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         ChaincodeMockPeer.checkScenarioStepEnded(server, 1, 5000, TimeUnit.MILLISECONDS);
 
         server.send(initMsg);
@@ -178,14 +181,16 @@ public Response invoke(final ChaincodeStub stub) {
 
         assertThat(server.getLastMessageSend().getType(), is(INIT));
         assertThat(server.getLastMessageRcvd().getType(), is(COMPLETED));
-        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(),
-                is("OK response1"));
+        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(), is("OK response1"));
 
         final ByteString invokePayload = ChaincodeInput.newBuilder()
-                .addArgs(ByteString.copyFromUtf8("invoke")).addArgs(ByteString.copyFromUtf8("a"))
-                .addArgs(ByteString.copyFromUtf8("10")).build().toByteString();
-        final ChaincodeMessage invokeMsg = MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0",
-                invokePayload, null);
+                .addArgs(ByteString.copyFromUtf8("invoke"))
+                .addArgs(ByteString.copyFromUtf8("a"))
+                .addArgs(ByteString.copyFromUtf8("10"))
+                .build()
+                .toByteString();
+        final ChaincodeMessage invokeMsg =
+                MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0", invokePayload, null);
 
         server.send(invokeMsg);
 
@@ -210,20 +215,22 @@ public Response init(final ChaincodeStub stub) {
             public Response invoke(final ChaincodeStub stub) {
                 final String aKey = stub.getStringArgs().get(1);
                 final byte[] epBytes = stub.getStateValidationParameter(aKey);
-                final StateBasedEndorsement stateBasedEndorsement = StateBasedEndorsementFactory.getInstance()
-                        .newStateBasedEndorsement(epBytes);
+                final StateBasedEndorsement stateBasedEndorsement =
+                        StateBasedEndorsementFactory.getInstance().newStateBasedEndorsement(epBytes);
                 assertThat(stateBasedEndorsement.listOrgs().size(), is(2));
                 stub.setStateValidationParameter(aKey, stateBasedEndorsement.policy());
                 return ResponseUtils.newSuccessResponse("OK response2");
             }
         };
 
-        final ByteString initPayload = ChaincodeInput.newBuilder().addArgs(ByteString.copyFromUtf8("init"))
-                .build().toByteString();
-        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0",
-                initPayload, null);
+        final ByteString initPayload = ChaincodeInput.newBuilder()
+                .addArgs(ByteString.copyFromUtf8("init"))
+                .build()
+                .toByteString();
+        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0", initPayload, null);
 
-        final StateBasedEndorsement sbe = StateBasedEndorsementFactory.getInstance().newStateBasedEndorsement(null);
+        final StateBasedEndorsement sbe =
+                StateBasedEndorsementFactory.getInstance().newStateBasedEndorsement(null);
         sbe.addOrgs(StateBasedEndorsement.RoleType.RoleTypePeer, "Org1");
         sbe.addOrgs(StateBasedEndorsement.RoleType.RoleTypeMember, "Org2");
 
@@ -238,7 +245,7 @@ public Response invoke(final ChaincodeStub stub) {
         setLogLevel("DEBUG");
         server = ChaincodeMockPeer.startServer(scenario);
 
-        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId" });
+        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         ChaincodeMockPeer.checkScenarioStepEnded(server, 1, 5000, TimeUnit.MILLISECONDS);
 
         server.send(initMsg);
@@ -246,22 +253,22 @@ public Response invoke(final ChaincodeStub stub) {
 
         assertThat(server.getLastMessageSend().getType(), is(INIT));
         assertThat(server.getLastMessageRcvd().getType(), is(COMPLETED));
-        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(),
-                is("OK response1"));
+        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(), is("OK response1"));
 
         final ByteString invokePayload = ChaincodeInput.newBuilder()
-                .addArgs(ByteString.copyFromUtf8("invoke")).addArgs(ByteString.copyFromUtf8("a")).build()
+                .addArgs(ByteString.copyFromUtf8("invoke"))
+                .addArgs(ByteString.copyFromUtf8("a"))
+                .build()
                 .toByteString();
-        final ChaincodeMessage invokeMsg = MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0",
-                invokePayload, null);
+        final ChaincodeMessage invokeMsg =
+                MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0", invokePayload, null);
 
         server.send(invokeMsg);
 
         ChaincodeMockPeer.checkScenarioStepEnded(server, 5, 5000, TimeUnit.MILLISECONDS);
         assertThat(server.getLastMessageSend().getType(), is(RESPONSE));
         assertThat(server.getLastMessageRcvd().getType(), is(COMPLETED));
-        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(),
-                is("OK response2"));
+        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(), is("OK response2"));
     }
 
     @Test
@@ -293,16 +300,20 @@ public Response invoke(final ChaincodeStub stub) {
             }
         };
 
-        final ByteString initPayload = ChaincodeInput.newBuilder().addArgs(ByteString.copyFromUtf8(""))
-                .build().toByteString();
-        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0",
-                initPayload, null);
+        final ByteString initPayload = ChaincodeInput.newBuilder()
+                .addArgs(ByteString.copyFromUtf8(""))
+                .build()
+                .toByteString();
+        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0", initPayload, null);
 
         final ByteString invokePayload = ChaincodeInput.newBuilder()
-                .addArgs(ByteString.copyFromUtf8("invoke")).addArgs(ByteString.copyFromUtf8("a"))
-                .addArgs(ByteString.copyFromUtf8("b")).build().toByteString();
-        final ChaincodeMessage invokeMsg = MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0",
-                invokePayload, null);
+                .addArgs(ByteString.copyFromUtf8("invoke"))
+                .addArgs(ByteString.copyFromUtf8("a"))
+                .addArgs(ByteString.copyFromUtf8("b"))
+                .build()
+                .toByteString();
+        final ChaincodeMessage invokeMsg =
+                MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0", invokePayload, null);
 
         final List scenario = new ArrayList<>();
         scenario.add(new RegisterStep());
@@ -318,7 +329,7 @@ public Response invoke(final ChaincodeStub stub) {
         setLogLevel("DEBUG");
         server = ChaincodeMockPeer.startServer(scenario);
 
-        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId" });
+        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         ChaincodeMockPeer.checkScenarioStepEnded(server, 1, 5000, TimeUnit.MILLISECONDS);
 
         server.send(initMsg);
@@ -329,16 +340,14 @@ public Response invoke(final ChaincodeStub stub) {
         ChaincodeMockPeer.checkScenarioStepEnded(server, 5, 5000, TimeUnit.MILLISECONDS);
         assertThat(server.getLastMessageSend().getType(), is(RESPONSE));
         assertThat(server.getLastMessageRcvd().getType(), is(COMPLETED));
-        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(),
-                is("OK response2"));
+        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(), is("OK response2"));
 
         server.send(invokeMsg);
 
         ChaincodeMockPeer.checkScenarioStepEnded(server, 9, 30000, TimeUnit.MILLISECONDS);
         assertThat(server.getLastMessageSend().getType(), is(RESPONSE));
         assertThat(server.getLastMessageRcvd().getType(), is(COMPLETED));
-        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(),
-                is("OK response2"));
+        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(), is("OK response2"));
     }
 
     @Test
@@ -367,16 +376,19 @@ public Response invoke(final ChaincodeStub stub) {
             }
         };
 
-        final ByteString initPayload = ChaincodeInput.newBuilder().addArgs(ByteString.copyFromUtf8(""))
-                .build().toByteString();
-        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0",
-                initPayload, null);
+        final ByteString initPayload = ChaincodeInput.newBuilder()
+                .addArgs(ByteString.copyFromUtf8(""))
+                .build()
+                .toByteString();
+        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0", initPayload, null);
 
         final ByteString invokePayload = ChaincodeInput.newBuilder()
-                .addArgs(ByteString.copyFromUtf8("invoke")).addArgs(ByteString.copyFromUtf8("query")).build()
+                .addArgs(ByteString.copyFromUtf8("invoke"))
+                .addArgs(ByteString.copyFromUtf8("query"))
+                .build()
                 .toByteString();
-        final ChaincodeMessage invokeMsg = MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0",
-                invokePayload, null);
+        final ChaincodeMessage invokeMsg =
+                MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0", invokePayload, null);
 
         final List scenario = new ArrayList<>();
         scenario.add(new RegisterStep());
@@ -392,7 +404,7 @@ public Response invoke(final ChaincodeStub stub) {
         setLogLevel("DEBUG");
         server = ChaincodeMockPeer.startServer(scenario);
 
-        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId" });
+        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         ChaincodeMockPeer.checkScenarioStepEnded(server, 1, 5000, TimeUnit.MILLISECONDS);
 
         server.send(initMsg);
@@ -403,16 +415,14 @@ public Response invoke(final ChaincodeStub stub) {
         ChaincodeMockPeer.checkScenarioStepEnded(server, 5, 5000, TimeUnit.MILLISECONDS);
         assertThat(server.getLastMessageSend().getType(), is(RESPONSE));
         assertThat(server.getLastMessageRcvd().getType(), is(COMPLETED));
-        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(),
-                is("OK response2"));
+        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(), is("OK response2"));
 
         server.send(invokeMsg);
 
         ChaincodeMockPeer.checkScenarioStepEnded(server, 9, 5000, TimeUnit.MILLISECONDS);
         assertThat(server.getLastMessageSend().getType(), is(RESPONSE));
         assertThat(server.getLastMessageRcvd().getType(), is(COMPLETED));
-        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(),
-                is("OK response2"));
+        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(), is("OK response2"));
     }
 
     @Test
@@ -441,16 +451,19 @@ public Response invoke(final ChaincodeStub stub) {
             }
         };
 
-        final ByteString initPayload = ChaincodeInput.newBuilder().addArgs(ByteString.copyFromUtf8(""))
-                .build().toByteString();
-        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0",
-                initPayload, null);
+        final ByteString initPayload = ChaincodeInput.newBuilder()
+                .addArgs(ByteString.copyFromUtf8(""))
+                .build()
+                .toByteString();
+        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0", initPayload, null);
 
         final ByteString invokePayload = ChaincodeInput.newBuilder()
-                .addArgs(ByteString.copyFromUtf8("invoke")).addArgs(ByteString.copyFromUtf8("key1")).build()
+                .addArgs(ByteString.copyFromUtf8("invoke"))
+                .addArgs(ByteString.copyFromUtf8("key1"))
+                .build()
                 .toByteString();
-        final ChaincodeMessage invokeMsg = MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0",
-                invokePayload, null);
+        final ChaincodeMessage invokeMsg =
+                MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0", invokePayload, null);
 
         final List scenario = new ArrayList<>();
         scenario.add(new RegisterStep());
@@ -462,7 +475,7 @@ public Response invoke(final ChaincodeStub stub) {
         setLogLevel("DEBUG");
         server = ChaincodeMockPeer.startServer(scenario);
 
-        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId" });
+        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         ChaincodeMockPeer.checkScenarioStepEnded(server, 1, 5000, TimeUnit.MILLISECONDS);
 
         server.send(initMsg);
@@ -473,9 +486,7 @@ public Response invoke(final ChaincodeStub stub) {
         ChaincodeMockPeer.checkScenarioStepEnded(server, 5, 5000, TimeUnit.MILLISECONDS);
         assertThat(server.getLastMessageSend().getType(), is(RESPONSE));
         assertThat(server.getLastMessageRcvd().getType(), is(COMPLETED));
-        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(),
-                is("OK response2"));
-
+        assertThat(Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(), is("OK response2"));
     }
 
     @Test
@@ -493,15 +504,18 @@ public Response invoke(final ChaincodeStub stub) {
             }
         };
 
-        final ByteString initPayload = ChaincodeInput.newBuilder().addArgs(ByteString.copyFromUtf8(""))
-                .build().toByteString();
-        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0",
-                initPayload, null);
+        final ByteString initPayload = ChaincodeInput.newBuilder()
+                .addArgs(ByteString.copyFromUtf8(""))
+                .build()
+                .toByteString();
+        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0", initPayload, null);
 
         final ByteString invokePayload = ChaincodeInput.newBuilder()
-                .addArgs(ByteString.copyFromUtf8("invoke")).build().toByteString();
-        final ChaincodeMessage invokeMsg = MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0",
-                invokePayload, null);
+                .addArgs(ByteString.copyFromUtf8("invoke"))
+                .build()
+                .toByteString();
+        final ChaincodeMessage invokeMsg =
+                MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0", invokePayload, null);
 
         final List scenario = new ArrayList<>();
         scenario.add(new RegisterStep());
@@ -512,7 +526,7 @@ public Response invoke(final ChaincodeStub stub) {
         setLogLevel("DEBUG");
         server = ChaincodeMockPeer.startServer(scenario);
 
-        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId" });
+        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         ChaincodeMockPeer.checkScenarioStepEnded(server, 1, 5000, TimeUnit.MILLISECONDS);
 
         server.send(initMsg);
@@ -540,9 +554,10 @@ public Response invoke(final ChaincodeStub stub) {
         };
 
         final ByteString payload = org.hyperledger.fabric.protos.peer.ChaincodeInput.newBuilder()
-                .addArgs(ByteString.copyFromUtf8("")).build().toByteString();
-        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0", payload,
-                null);
+                .addArgs(ByteString.copyFromUtf8(""))
+                .build()
+                .toByteString();
+        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0", payload, null);
 
         final List scenario = new ArrayList<>();
         scenario.add(new RegisterStep());
@@ -552,7 +567,7 @@ public Response invoke(final ChaincodeStub stub) {
         setLogLevel("DEBUG");
         server = ChaincodeMockPeer.startServer(scenario);
 
-        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId" });
+        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         ChaincodeMockPeer.checkScenarioStepEnded(server, 1, 5000, TimeUnit.MILLISECONDS);
 
         server.send(initMsg);
@@ -560,19 +575,23 @@ public Response invoke(final ChaincodeStub stub) {
 
         assertThat(server.getLastMessageSend().getType(), is(INIT));
         assertThat(server.getLastMessageRcvd().getType(), is(COMPLETED));
-        String resp1 = (Response.parseFrom(server.getLastMessageRcvd().getPayload()).getPayload().toStringUtf8());
+        String resp1 = (Response.parseFrom(server.getLastMessageRcvd().getPayload())
+                .getPayload()
+                .toStringUtf8());
         assertThat(resp1, is("Wrong response1"));
 
         final ByteString invokePayload = ChaincodeInput.newBuilder().build().toByteString();
-        final ChaincodeMessage invokeMsg = MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0",
-                invokePayload, null);
+        final ChaincodeMessage invokeMsg =
+                MessageUtil.newEventMessage(TRANSACTION, "testChannel", "0", invokePayload, null);
 
         server.send(invokeMsg);
 
         ChaincodeMockPeer.checkScenarioStepEnded(server, 3, 5000, TimeUnit.MILLISECONDS);
         assertThat(server.getLastMessageSend().getType(), is(TRANSACTION));
         assertThat(server.getLastMessageRcvd().getType(), is(COMPLETED));
-        String resp2 = Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage().toString();
+        String resp2 = Response.parseFrom(server.getLastMessageRcvd().getPayload())
+                .getMessage()
+                .toString();
         assertThat(resp2, is("Wrong response2"));
     }
 
@@ -595,9 +614,10 @@ public Response invoke(final ChaincodeStub stub) {
         };
 
         final ByteString payload = org.hyperledger.fabric.protos.peer.ChaincodeInput.newBuilder()
-                .addArgs(ByteString.copyFromUtf8("")).build().toByteString();
-        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0", payload,
-                null);
+                .addArgs(ByteString.copyFromUtf8(""))
+                .build()
+                .toByteString();
+        final ChaincodeMessage initMsg = MessageUtil.newEventMessage(INIT, "testChannel", "0", payload, null);
 
         final List scenario = new ArrayList<>();
         scenario.add(new RegisterStep());
@@ -606,7 +626,7 @@ public Response invoke(final ChaincodeStub stub) {
         setLogLevel("DEBUG");
         server = ChaincodeMockPeer.startServer(scenario);
 
-        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId" });
+        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
         ChaincodeMockPeer.checkScenarioStepEnded(server, 1, 5000, TimeUnit.MILLISECONDS);
         server.send(initMsg);
         server.stop();
@@ -624,9 +644,10 @@ public void testChaincodeLogLevel() throws Exception {
         setLogLevel("DEBUG");
         server = ChaincodeMockPeer.startServer(scenario);
 
-        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId" });
+        cb.start(new String[] {"-a", "127.0.0.1:7052", "-i", "testId"});
 
-        assertEquals(Level.FINEST,
+        assertEquals(
+                Level.FINEST,
                 Logger.getLogger(cb.getClass().getPackage().getName()).getLevel(),
                 "Wrong debug level for " + cb.getClass().getPackage().getName());
     }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/ChaincodeMessageFactoryTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/ChaincodeMessageFactoryTest.java
index 97da696b..2a7c561e 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/ChaincodeMessageFactoryTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/ChaincodeMessageFactoryTest.java
@@ -6,16 +6,15 @@
 
 package org.hyperledger.fabric.shim.impl;
 
-import org.hyperledger.fabric.protos.peer.ChaincodeID;
+import com.google.protobuf.ByteString;
 import org.hyperledger.fabric.protos.peer.ChaincodeEvent;
+import org.hyperledger.fabric.protos.peer.ChaincodeID;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type;
 import org.hyperledger.fabric.shim.Chaincode.Response;
 import org.hyperledger.fabric.shim.ResponseUtils;
 import org.junit.jupiter.api.Test;
 
-import com.google.protobuf.ByteString;
-
 class ChaincodeMessageFactoryTest {
 
     private final String txId = "txid";
@@ -29,7 +28,8 @@ class ChaincodeMessageFactoryTest {
     private ChaincodeEvent event;
     private final Response response = ResponseUtils.newSuccessResponse();
     private final ByteString payload = ByteString.copyFromUtf8("Hello");
-    private final ChaincodeID chaincodeId = ChaincodeID.newBuilder().setName("test").build();
+    private final ChaincodeID chaincodeId =
+            ChaincodeID.newBuilder().setName("test").build();
     private final Type type = ChaincodeMessage.Type.COMPLETED;
 
     @Test
@@ -90,5 +90,4 @@ void testNewEventMessageTypeStringStringByteString() {
         ChaincodeMessageFactory.newEventMessage(type, channelId, txId, payload);
         ChaincodeMessageFactory.newEventMessage(type, channelId, txId, payload, event);
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/ChaincodeSupportClientTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/ChaincodeSupportClientTest.java
index c3cf24d8..2bdf9c87 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/ChaincodeSupportClientTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/ChaincodeSupportClientTest.java
@@ -5,8 +5,12 @@
  */
 package org.hyperledger.fabric.shim.impl;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.stub.StreamObserver;
+import java.io.IOException;
+import java.util.Properties;
 import org.hyperledger.fabric.metrics.Metrics;
 import org.hyperledger.fabric.protos.peer.ChaincodeID;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
@@ -19,11 +23,6 @@
 import uk.org.webcompere.systemstubs.jupiter.SystemStub;
 import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension;
 
-import java.io.IOException;
-import java.util.Properties;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
 @ExtendWith(SystemStubsExtension.class)
 class ChaincodeSupportClientTest {
     @SystemStub
@@ -44,15 +43,18 @@ void testStartInvocationTaskManagerAndRequestObserverNull() throws IOException {
         ChaincodeSupportClient chaincodeSupportClient = new ChaincodeSupportClient(managedChannelBuilder);
 
         assertThatThrownBy(
-                () -> {
-                    final ChaincodeID chaincodeId = ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
-                    final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
-
-                    final StreamObserver requestObserver = null;
-                    chaincodeSupportClient.start(itm, requestObserver);
-                },
-                "StreamObserver 'requestObserver' for chat with peer can't be null"
-        ).isInstanceOf(IOException.class);
+                        () -> {
+                            final ChaincodeID chaincodeId = ChaincodeID.newBuilder()
+                                    .setName("chaincodeIdNumber12345")
+                                    .build();
+                            final InvocationTaskManager itm =
+                                    InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
+
+                            final StreamObserver requestObserver = null;
+                            chaincodeSupportClient.start(itm, requestObserver);
+                        },
+                        "StreamObserver 'requestObserver' for chat with peer can't be null")
+                .isInstanceOf(IOException.class);
         environmentVariables.remove("CORE_CHAINCODE_ID_NAME");
     }
 
@@ -71,26 +73,20 @@ void testStartInvocationTaskManagerNullAndRequestObserver() throws IOException {
         ChaincodeSupportClient chaincodeSupportClient = new ChaincodeSupportClient(managedChannelBuilder);
 
         assertThatThrownBy(
-                () -> {
-                    chaincodeSupportClient.start(null, new StreamObserver() {
-                        @Override
-                        public void onNext(final ChaincodeMessage value) {
-
-                        }
-
-                        @Override
-                        public void onError(final Throwable t) {
-
-                        }
-
-                        @Override
-                        public void onCompleted() {
-
-                        }
-                    });
-                },
-                "InvocationTaskManager 'itm' can't be null"
-        ).isInstanceOf(IOException.class);
+                        () -> {
+                            chaincodeSupportClient.start(null, new StreamObserver() {
+                                @Override
+                                public void onNext(final ChaincodeMessage value) {}
+
+                                @Override
+                                public void onError(final Throwable t) {}
+
+                                @Override
+                                public void onCompleted() {}
+                            });
+                        },
+                        "InvocationTaskManager 'itm' can't be null")
+                .isInstanceOf(IOException.class);
         environmentVariables.remove("CORE_CHAINCODE_ID_NAME");
     }
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InnvocationTaskManagerTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InnvocationTaskManagerTest.java
index 6ef01199..fd51e718 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InnvocationTaskManagerTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InnvocationTaskManagerTest.java
@@ -5,8 +5,13 @@
  */
 package org.hyperledger.fabric.shim.impl;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.google.protobuf.ByteString;
 import io.grpc.ManagedChannelBuilder;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.function.Consumer;
 import org.hyperledger.fabric.metrics.Metrics;
 import org.hyperledger.fabric.protos.peer.ChaincodeID;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
@@ -22,12 +27,6 @@
 import uk.org.webcompere.systemstubs.jupiter.SystemStub;
 import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension;
 
-import java.io.IOException;
-import java.util.Properties;
-import java.util.function.Consumer;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 @ExtendWith(SystemStubsExtension.class)
 class InnvocationTaskManagerTest {
     @SystemStub
@@ -64,7 +63,8 @@ void getManager() throws IOException {
         Traces.initialize(props);
         Metrics.initialize(props);
 
-        final ChaincodeID chaincodeId = ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
+        final ChaincodeID chaincodeId =
+                ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
         final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
     }
 
@@ -80,24 +80,25 @@ void getManagerChaincodeIDNull() throws IOException {
         Traces.initialize(props);
 
         Assertions.assertThrows(
-                IllegalArgumentException.class, () -> {
+                IllegalArgumentException.class,
+                () -> {
                     final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, null);
                 },
-                "chaincodeId can't be null"
-        );
+                "chaincodeId can't be null");
     }
 
     @Test
     void getManagerChaincodeBaseNull() throws IOException {
 
-        final ChaincodeID chaincodeId = ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
+        final ChaincodeID chaincodeId =
+                ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
 
         Assertions.assertThrows(
-                IllegalArgumentException.class, () -> {
+                IllegalArgumentException.class,
+                () -> {
                     final InvocationTaskManager itm = InvocationTaskManager.getManager(null, chaincodeId);
                 },
-                "chaincode is null"
-        );
+                "chaincode is null");
     }
 
     @Test
@@ -111,13 +112,12 @@ void onChaincodeMessage() throws IOException {
         Metrics.initialize(props);
         Traces.initialize(props);
 
-        final ChaincodeID chaincodeId = ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
+        final ChaincodeID chaincodeId =
+                ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
         final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
 
         Assertions.assertThrows(
-                IllegalArgumentException.class, () -> itm.onChaincodeMessage(null),
-            "chaincodeMessage is null"
-        );
+                IllegalArgumentException.class, () -> itm.onChaincodeMessage(null), "chaincodeMessage is null");
     }
 
     @Test
@@ -131,7 +131,8 @@ void setResponseConsumer() throws IOException {
         Metrics.initialize(props);
         Traces.initialize(props);
 
-        final ChaincodeID chaincodeId = ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
+        final ChaincodeID chaincodeId =
+                ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
         final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
         itm.setResponseConsumer(null);
     }
@@ -147,14 +148,11 @@ void registerException() {
         Metrics.initialize(props);
         Traces.initialize(props);
 
-        final ChaincodeID chaincodeId = ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
+        final ChaincodeID chaincodeId =
+                ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
         final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
 
-        Assertions.assertThrows(
-                IllegalArgumentException.class, itm::register,
-                "outgoingMessage is null"
-        );
-
+        Assertions.assertThrows(IllegalArgumentException.class, itm::register, "outgoingMessage is null");
     }
 
     @Test
@@ -168,7 +166,8 @@ void onChaincodeMessageREGISTER() {
         Metrics.initialize(props);
         Traces.initialize(props);
 
-        final ChaincodeID chaincodeId = ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
+        final ChaincodeID chaincodeId =
+                ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
         final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
         final Consumer consumer = t -> {
             assertEquals(ChaincodeMessageFactory.newRegisterChaincodeMessage(chaincodeId), t);
@@ -191,15 +190,16 @@ void onChaincodeMessageInvokeChaincode() {
         Traces.initialize(props);
 
         final String chaincodeIdNumber = "chaincodeIdNumber12345";
-        final ChaincodeID chaincodeId = ChaincodeID.newBuilder().setName(chaincodeIdNumber).build();
+        final ChaincodeID chaincodeId =
+                ChaincodeID.newBuilder().setName(chaincodeIdNumber).build();
         final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
         final Consumer consumer = t -> {
             assertEquals(ChaincodeMessageFactory.newRegisterChaincodeMessage(chaincodeId), t);
         };
 
         itm.setResponseConsumer(consumer);
-        final ChaincodeMessage chaincodeMessage = ChaincodeMessageFactory
-                .newInvokeChaincodeMessage(chaincodeIdNumber, "txid", ByteString.copyFromUtf8(""));
+        final ChaincodeMessage chaincodeMessage = ChaincodeMessageFactory.newInvokeChaincodeMessage(
+                chaincodeIdNumber, "txid", ByteString.copyFromUtf8(""));
         itm.onChaincodeMessage(chaincodeMessage);
     }
 
@@ -215,15 +215,16 @@ void onChaincodeMessagePutState() {
         Traces.initialize(props);
 
         final String chaincodeIdNumber = "chaincodeIdNumber12345";
-        final ChaincodeID chaincodeId = ChaincodeID.newBuilder().setName(chaincodeIdNumber).build();
+        final ChaincodeID chaincodeId =
+                ChaincodeID.newBuilder().setName(chaincodeIdNumber).build();
         final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
         final Consumer consumer = t -> {
             assertEquals(ChaincodeMessageFactory.newRegisterChaincodeMessage(chaincodeId), t);
         };
 
         itm.setResponseConsumer(consumer);
-        final ChaincodeMessage chaincodeMessage = ChaincodeMessageFactory
-                .newPutStateEventMessage(chaincodeIdNumber, "txid", "collection", "key", ByteString.copyFromUtf8("value"));
+        final ChaincodeMessage chaincodeMessage = ChaincodeMessageFactory.newPutStateEventMessage(
+                chaincodeIdNumber, "txid", "collection", "key", ByteString.copyFromUtf8("value"));
         itm.onChaincodeMessage(chaincodeMessage);
     }
 
@@ -241,7 +242,8 @@ void shutdown() throws IOException {
         final ManagedChannelBuilder managedChannelBuilder = chaincodeBase.newChannelBuilder();
         ChaincodeSupportClient chaincodeSupportClient = new ChaincodeSupportClient(managedChannelBuilder);
 
-        final ChaincodeID chaincodeId = ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
+        final ChaincodeID chaincodeId =
+                ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
         final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
         itm.shutdown();
     }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InvocationStubImplTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InvocationStubImplTest.java
index 8d2b4720..b053a869 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InvocationStubImplTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InvocationStubImplTest.java
@@ -15,7 +15,6 @@
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.GetStateByRange;
 import org.hyperledger.fabric.protos.peer.QueryResponse;
@@ -41,8 +40,8 @@ class GetStateByRangeTests {
 
         @BeforeEach
         public void beforeEach() throws Exception {
-            final ChaincodeMessage mockMessage = ChaincodeMessageFactory.newGetStateEventMessage(channelId, txId, "",
-                    "key");
+            final ChaincodeMessage mockMessage =
+                    ChaincodeMessageFactory.newGetStateEventMessage(channelId, txId, "", "key");
             mockHandler = mock(ChaincodeInvocationTask.class);
             final ByteString mockString = QueryResponse.newBuilder().build().toByteString();
 
@@ -105,12 +104,10 @@ public void unbounded() throws InvalidProtocolBufferException {
         @Test
         public void simplekeys() {
             assertThatThrownBy(() -> {
-                final QueryResultsIterator qri = stubImpl
-                        .getStateByRange(new String(Character.toChars(Character.MIN_CODE_POINT)), "");
-            }).hasMessageContaining("not allowed");
-
+                        final QueryResultsIterator qri =
+                                stubImpl.getStateByRange(new String(Character.toChars(Character.MIN_CODE_POINT)), "");
+                    })
+                    .hasMessageContaining("not allowed");
         }
-
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InvocationTaskManagerTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InvocationTaskManagerTest.java
index ae4ee29a..7fd6b760 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InvocationTaskManagerTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InvocationTaskManagerTest.java
@@ -5,7 +5,14 @@
  */
 package org.hyperledger.fabric.shim.impl;
 
+import static org.mockito.Mockito.when;
+
 import com.google.protobuf.ByteString;
+import java.io.UnsupportedEncodingException;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
 import org.hyperledger.fabric.metrics.Metrics;
 import org.hyperledger.fabric.protos.peer.ChaincodeID;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
@@ -16,14 +23,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-import java.io.UnsupportedEncodingException;
-import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.LogManager;
-import java.util.logging.Logger;
-
-import static org.mockito.Mockito.when;
-
 public final class InvocationTaskManagerTest {
 
     private InvocationTaskManager itm;
@@ -42,8 +41,7 @@ public void setup() {
 
         perfLogger = LogManager.getLogManager().getLogger("org.hyperledger.Performance");
         perfLogger.setLevel(Level.ALL);
-        this.itm.setResponseConsumer((value) -> {
-        });
+        this.itm.setResponseConsumer((value) -> {});
     }
 
     @AfterEach
@@ -61,51 +59,47 @@ public void register() throws UnsupportedEncodingException {
     @Test
     public void onMessageTestTx() throws UnsupportedEncodingException {
 
-        final ChaincodeMessage msg = ChaincodeMessageFactory.newEventMessage(ChaincodeMessage.Type.TRANSACTION,
-                "mychannel", "txid", ByteString.copyFrom("Hello", "UTF-8"));
+        final ChaincodeMessage msg = ChaincodeMessageFactory.newEventMessage(
+                ChaincodeMessage.Type.TRANSACTION, "mychannel", "txid", ByteString.copyFrom("Hello", "UTF-8"));
 
         when(chaincode.getState()).thenReturn(ChaincodeBase.CCState.READY);
 
         itm.onChaincodeMessage(msg);
-
     }
 
     @Test
     public void onWrongCreatedState() throws UnsupportedEncodingException {
 
         perfLogger.setLevel(Level.ALL);
-        final ChaincodeMessage msg = ChaincodeMessageFactory.newEventMessage(ChaincodeMessage.Type.TRANSACTION,
-                "mychannel", "txid", ByteString.copyFrom("Hello", "UTF-8"));
+        final ChaincodeMessage msg = ChaincodeMessageFactory.newEventMessage(
+                ChaincodeMessage.Type.TRANSACTION, "mychannel", "txid", ByteString.copyFrom("Hello", "UTF-8"));
 
         when(chaincode.getState()).thenReturn(ChaincodeBase.CCState.CREATED);
 
         itm.onChaincodeMessage(msg);
-
     }
 
     @Test
     public void onWrongEstablishedState() throws UnsupportedEncodingException {
 
-        final ChaincodeMessage msg = ChaincodeMessageFactory.newEventMessage(ChaincodeMessage.Type.TRANSACTION,
-                "mychannel", "txid", ByteString.copyFrom("Hello", "UTF-8"));
+        final ChaincodeMessage msg = ChaincodeMessageFactory.newEventMessage(
+                ChaincodeMessage.Type.TRANSACTION, "mychannel", "txid", ByteString.copyFrom("Hello", "UTF-8"));
 
         when(chaincode.getState()).thenReturn(ChaincodeBase.CCState.ESTABLISHED);
 
         // final InvocationTaskManager itm =
         // InvocationTaskManager.getManager(chaincode, id);
         itm.onChaincodeMessage(msg);
-
     }
 
     @Test
     public void onErrorResponse() throws UnsupportedEncodingException {
 
-        final ChaincodeMessage msg = ChaincodeMessageFactory.newEventMessage(ChaincodeMessage.Type.ERROR, "mychannel",
-                "txid", ByteString.copyFrom("Hello", "UTF-8"));
+        final ChaincodeMessage msg = ChaincodeMessageFactory.newEventMessage(
+                ChaincodeMessage.Type.ERROR, "mychannel", "txid", ByteString.copyFrom("Hello", "UTF-8"));
 
         when(chaincode.getState()).thenReturn(ChaincodeBase.CCState.READY);
 
         itm.onChaincodeMessage(msg);
-
     }
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/KeyModificationImplTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/KeyModificationImplTest.java
index 51fc0193..2dc72dc9 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/KeyModificationImplTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/KeyModificationImplTest.java
@@ -6,14 +6,6 @@
 
 package org.hyperledger.fabric.shim.impl;
 
-import com.google.protobuf.ByteString;
-import com.google.protobuf.Timestamp;
-import org.hyperledger.fabric.shim.ledger.KeyModification;
-import org.junit.jupiter.api.Test;
-
-import java.time.Instant;
-import java.util.stream.Stream;
-
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -23,6 +15,13 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Timestamp;
+import java.time.Instant;
+import java.util.stream.Stream;
+import org.hyperledger.fabric.shim.ledger.KeyModification;
+import org.junit.jupiter.api.Test;
+
 public class KeyModificationImplTest {
 
     @Test
@@ -30,64 +29,66 @@ public void testKeyModificationImpl() {
         new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
                 .setTxId("txid")
                 .setValue(ByteString.copyFromUtf8("value"))
-                .setTimestamp(Timestamp.newBuilder()
-                        .setSeconds(1234567890)
-                        .setNanos(123456789))
+                .setTimestamp(Timestamp.newBuilder().setSeconds(1234567890).setNanos(123456789))
                 .setIsDelete(true)
                 .build());
     }
 
     @Test
     public void testGetTxId() {
-        final KeyModification km = new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
-                .setTxId("txid")
-                .build());
+        final KeyModification km =
+                new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
+                        .setTxId("txid")
+                        .build());
         assertThat(km.getTxId(), is(equalTo("txid")));
     }
 
     @Test
     public void testGetValue() {
-        final KeyModification km = new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
-                .setValue(ByteString.copyFromUtf8("value"))
-                .build());
+        final KeyModification km =
+                new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
+                        .setValue(ByteString.copyFromUtf8("value"))
+                        .build());
         assertThat(km.getValue(), is(equalTo("value".getBytes(UTF_8))));
     }
 
     @Test
     public void testGetStringValue() {
-        final KeyModification km = new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
-                .setValue(ByteString.copyFromUtf8("value"))
-                .build());
+        final KeyModification km =
+                new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
+                        .setValue(ByteString.copyFromUtf8("value"))
+                        .build());
         assertThat(km.getStringValue(), is(equalTo("value")));
     }
 
     @Test
     public void testGetTimestamp() {
-        final KeyModification km = new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
-                .setTimestamp(Timestamp.newBuilder()
-                        .setSeconds(1234567890L)
-                        .setNanos(123456789))
-                .build());
+        final KeyModification km =
+                new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
+                        .setTimestamp(
+                                Timestamp.newBuilder().setSeconds(1234567890L).setNanos(123456789))
+                        .build());
         assertThat(km.getTimestamp(), hasProperty("epochSecond", equalTo(1234567890L)));
         assertThat(km.getTimestamp(), hasProperty("nano", equalTo(123456789)));
     }
 
     @Test
     public void testIsDeleted() {
-        Stream.of(true, false)
-                .forEach(b -> {
-                    final KeyModification km = new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
+        Stream.of(true, false).forEach(b -> {
+            final KeyModification km = new KeyModificationImpl(
+                    org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
                             .setIsDelete(b)
                             .build());
-                    assertThat(km.isDeleted(), is(b));
-                });
+            assertThat(km.isDeleted(), is(b));
+        });
     }
 
     @Test
     public void testHashCode() {
-        final KeyModification km = new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
-                .setIsDelete(false)
-                .build());
+        final KeyModification km =
+                new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
+                        .setIsDelete(false)
+                        .build());
 
         int expectedHashCode = 31;
         expectedHashCode = expectedHashCode + 1237;
@@ -96,24 +97,25 @@ public void testHashCode() {
         expectedHashCode = expectedHashCode * 31 + ByteString.copyFromUtf8("").hashCode();
 
         assertEquals(expectedHashCode, km.hashCode(), "Wrong hash code");
-
     }
 
     @Test
     public void testEquals() {
-        final KeyModification km1 = new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
-                .setIsDelete(false)
-                .build());
-        final KeyModification km2 = new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
-                .setIsDelete(true)
-                .build());
-
-        final KeyModification km3 = new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
-                .setIsDelete(false)
-                .build());
+        final KeyModification km1 =
+                new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
+                        .setIsDelete(false)
+                        .build());
+        final KeyModification km2 =
+                new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
+                        .setIsDelete(true)
+                        .build());
+
+        final KeyModification km3 =
+                new KeyModificationImpl(org.hyperledger.fabric.protos.ledger.queryresult.KeyModification.newBuilder()
+                        .setIsDelete(false)
+                        .build());
 
         assertFalse(km1.equals(km2));
         assertTrue(km1.equals(km3));
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/KeyValueImplTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/KeyValueImplTest.java
index 216398d6..3b8bbf43 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/KeyValueImplTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/KeyValueImplTest.java
@@ -6,17 +6,17 @@
 
 package org.hyperledger.fabric.shim.impl;
 
-import com.google.protobuf.ByteString;
-import org.hyperledger.fabric.protos.ledger.queryresult.KV;
-import org.junit.jupiter.api.Test;
-
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.google.protobuf.ByteString;
+import org.hyperledger.fabric.protos.ledger.queryresult.KV;
+import org.junit.jupiter.api.Test;
 
 public class KeyValueImplTest {
 
@@ -57,8 +57,7 @@ public void testGetStringValue() {
 
     @Test
     public void testHashCode() {
-        final KeyValueImpl kv = new KeyValueImpl(KV.newBuilder()
-                .build());
+        final KeyValueImpl kv = new KeyValueImpl(KV.newBuilder().build());
 
         int expectedHashCode = 31;
         expectedHashCode = expectedHashCode + "".hashCode();
@@ -92,7 +91,5 @@ public void testEquals() {
         assertFalse(kv1.equals(kv2));
         assertFalse(kv1.equals(kv3));
         assertTrue(kv1.equals(kv4));
-
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/QueryResultsIteratorWithMetadataImplTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/QueryResultsIteratorWithMetadataImplTest.java
index 9f312564..3d1b299f 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/QueryResultsIteratorWithMetadataImplTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/QueryResultsIteratorWithMetadataImplTest.java
@@ -6,25 +6,23 @@
 
 package org.hyperledger.fabric.shim.impl;
 
-import static org.hamcrest.Matchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import com.google.protobuf.ByteString;
 import java.util.function.Function;
-
 import org.hyperledger.fabric.protos.peer.QueryResponse;
-import org.hyperledger.fabric.protos.peer.QueryResultBytes;
 import org.hyperledger.fabric.protos.peer.QueryResponseMetadata;
+import org.hyperledger.fabric.protos.peer.QueryResultBytes;
 import org.junit.jupiter.api.Test;
 
-import com.google.protobuf.ByteString;
-
 public class QueryResultsIteratorWithMetadataImplTest {
 
     @Test
     public void getMetadata() {
-        final QueryResultsIteratorWithMetadataImpl testIter = new QueryResultsIteratorWithMetadataImpl<>(null, "", "",
-                prepareQueryResponse().toByteString(), queryResultBytesToKv);
+        final QueryResultsIteratorWithMetadataImpl testIter = new QueryResultsIteratorWithMetadataImpl<>(
+                null, "", "", prepareQueryResponse().toByteString(), queryResultBytesToKv);
         assertThat(testIter.getMetadata().getBookmark(), is("asdf"));
         assertThat(testIter.getMetadata().getFetchedRecordsCount(), is(2));
     }
@@ -32,7 +30,8 @@ public void getMetadata() {
     @Test
     public void getInvalidMetadata() {
         try {
-            new QueryResultsIteratorWithMetadataImpl<>(null, "", "", prepareQueryResponseWrongMeta().toByteString(), queryResultBytesToKv);
+            new QueryResultsIteratorWithMetadataImpl<>(
+                    null, "", "", prepareQueryResponseWrongMeta().toByteString(), queryResultBytesToKv);
             fail();
         } catch (final RuntimeException e) {
         }
@@ -55,16 +54,11 @@ private QueryResponse prepareQueryResponse() {
                 .setHasMore(false)
                 .setMetadata(qrm.toByteString())
                 .build();
-
     }
 
     private QueryResponse prepareQueryResponseWrongMeta() {
         final ByteString bs = ByteString.copyFrom(new byte[] {0, 0});
 
-        return QueryResponse.newBuilder()
-                .setHasMore(false)
-                .setMetadata(bs)
-                .build();
-
+        return QueryResponse.newBuilder().setHasMore(false).setMetadata(bs).build();
     }
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ledger/CompositeKeyTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ledger/CompositeKeyTest.java
index 2fce7d4f..d2bac2f8 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ledger/CompositeKeyTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ledger/CompositeKeyTest.java
@@ -6,10 +6,6 @@
 
 package org.hyperledger.fabric.shim.ledger;
 
-import org.junit.jupiter.api.Test;
-
-import java.util.Arrays;
-
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
@@ -17,6 +13,9 @@
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 
+import java.util.Arrays;
+import org.junit.jupiter.api.Test;
+
 public class CompositeKeyTest {
     @Test
     public void testValidateSimpleKeys() {
@@ -108,14 +107,15 @@ public void testParseCompositeKey() {
 
     @Test
     public void testParseCompositeKeyInvalidObjectType() {
-        assertThatThrownBy(() -> CompositeKey.parseCompositeKey("ab\udbff\udfffc\u0000def\u0000ghi\u0000jkl\u0000mno\u0000"))
+        assertThatThrownBy(() ->
+                        CompositeKey.parseCompositeKey("ab\udbff\udfffc\u0000def\u0000ghi\u0000jkl\u0000mno\u0000"))
                 .isInstanceOf(CompositeKeyFormatException.class);
     }
 
     @Test
     public void testParseCompositeKeyInvalidAttribute() {
-        assertThatThrownBy(() -> CompositeKey.parseCompositeKey("abc\u0000def\u0000ghi\u0000jk\udbff\udfffl\u0000mno\u0000"))
+        assertThatThrownBy(() ->
+                        CompositeKey.parseCompositeKey("abc\u0000def\u0000ghi\u0000jk\udbff\udfffl\u0000mno\u0000"))
                 .isInstanceOf(CompositeKeyFormatException.class);
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/ChaincodeMockPeer.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/ChaincodeMockPeer.java
index badf8ca6..710b9eb0 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/ChaincodeMockPeer.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/ChaincodeMockPeer.java
@@ -6,27 +6,23 @@
 
 package org.hyperledger.fabric.shim.mock.peer;
 
+import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.PUT_STATE;
+
+import io.grpc.Server;
+import io.grpc.ServerBuilder;
+import io.grpc.stub.StreamObserver;
 import java.io.IOException;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.ChaincodeSupportGrpc;
 import org.hyperledger.fabric.shim.utils.TimeoutUtil;
 
-import io.grpc.Server;
-import io.grpc.ServerBuilder;
-import io.grpc.stub.StreamObserver;
-import static org.hyperledger.fabric.protos.peer.ChaincodeMessage.Type.PUT_STATE;
-
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * Mock peer implementation
- */
+/** Mock peer implementation */
 public final class ChaincodeMockPeer {
     private static final Logger LOGGER = Logger.getLogger(ChaincodeMockPeer.class.getName());
 
@@ -38,7 +34,7 @@ public final class ChaincodeMockPeer {
      * Constructor
      *
      * @param scenario list of scenario steps
-     * @param port     mock peer communication port
+     * @param port mock peer communication port
      * @throws IOException
      */
     public ChaincodeMockPeer(final List scenario, final int port) {
@@ -48,9 +44,7 @@ public ChaincodeMockPeer(final List scenario, final int port) {
         this.server = sb.addService(this.service).build();
     }
 
-    /**
-     * Start serving requests.
-     */
+    /** Start serving requests. */
     public void start() throws IOException {
         server.start();
         LOGGER.info("Server started, listening on " + port);
@@ -65,9 +59,7 @@ public void run() {
         });
     }
 
-    /**
-     * Stop serving requests and shutdown resources.
-     */
+    /** Stop serving requests and shutdown resources. */
     public void stop() {
         if (server != null) {
             server.shutdownNow();
@@ -99,21 +91,16 @@ public int getLastExecutedStep() {
         return this.service.lastExecutedStepNumber;
     }
 
-    /**
-     * @return last received message from chaincode
-     */
+    /** @return last received message from chaincode */
     public ChaincodeMessage getLastMessageRcvd() {
         return this.service.lastMessageRcvd;
-
     }
 
     public ArrayList getAllReceivedMessages() {
         return this.service.allMessages;
     }
 
-    /**
-     * @return last message sent by peer to chaincode
-     */
+    /** @return last message sent by peer to chaincode */
     public ChaincodeMessage getLastMessageSend() {
         return this.service.lastMessageSend;
     }
@@ -161,8 +148,7 @@ public void send(final ChaincodeMessage msg) {
          * @return
          */
         @Override
-        public StreamObserver register(
-                final StreamObserver responseObserver) {
+        public StreamObserver register(final StreamObserver responseObserver) {
             observer = responseObserver;
             return new StreamObserver() {
 
@@ -180,7 +166,8 @@ public void onNext(final ChaincodeMessage chaincodeMessage) {
                         if (chaincodeMessage.getType().equals(PUT_STATE)) {
                             final ChaincodeMessage m = ChaincodeMessage.newBuilder()
                                     .setType(ChaincodeMessage.Type.RESPONSE)
-                                    .setChannelId(chaincodeMessage.getChannelId()).setTxid(chaincodeMessage.getTxid())
+                                    .setChannelId(chaincodeMessage.getChannelId())
+                                    .setTxid(chaincodeMessage.getTxid())
                                     .build();
                             Thread.sleep(500);
                             ChaincodeMockPeerService.this.send(m);
@@ -195,7 +182,8 @@ public void onNext(final ChaincodeMessage chaincodeMessage) {
                                     ChaincodeMockPeerService.this.send(m);
                                 }
                             } else {
-                                LOGGER.warning("Non expected message rcvd in step " + step.getClass().getSimpleName());
+                                LOGGER.warning("Non expected message rcvd in step "
+                                        + step.getClass().getSimpleName());
                             }
                             ChaincodeMockPeerService.this.lastExecutedStepNumber++;
                         }
@@ -210,30 +198,30 @@ public void onError(final Throwable throwable) {
                 }
 
                 @Override
-                public void onCompleted() {
-
-                }
+                public void onCompleted() {}
             };
         }
     }
 
-    public static void checkScenarioStepEnded(final ChaincodeMockPeer s, final int step, final int timeout,
-            final TimeUnit units) throws Exception {
+    public static void checkScenarioStepEnded(
+            final ChaincodeMockPeer s, final int step, final int timeout, final TimeUnit units) throws Exception {
         try {
-            TimeoutUtil.runWithTimeout(new Thread(() -> {
-                while (true) {
-                    if (s.getLastExecutedStep() == step) {
-                        return;
-                    }
-                    try {
-                        Thread.sleep(500);
-                    } catch (final InterruptedException e) {
-                    }
-                }
-            }), timeout, units);
+            TimeoutUtil.runWithTimeout(
+                    new Thread(() -> {
+                        while (true) {
+                            if (s.getLastExecutedStep() == step) {
+                                return;
+                            }
+                            try {
+                                Thread.sleep(500);
+                            } catch (final InterruptedException e) {
+                            }
+                        }
+                    }),
+                    timeout,
+                    units);
         } catch (final TimeoutException e) {
             System.out.println("Got timeout, step " + step + " not finished");
         }
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/CompleteStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/CompleteStep.java
index 625de587..34ea010b 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/CompleteStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/CompleteStep.java
@@ -8,12 +8,9 @@
 
 import java.util.Collections;
 import java.util.List;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 
-/**
- * Waits for COMPLETED message, sends nothing back
- */
+/** Waits for COMPLETED message, sends nothing back */
 public final class CompleteStep implements ScenarioStep {
     @Override
     public boolean expected(final ChaincodeMessage msg) {
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/DelValueStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/DelValueStep.java
index 95b31012..37ef42b0 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/DelValueStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/DelValueStep.java
@@ -7,12 +7,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 
 /**
- * Simulates delState() invocation in chaincode Waits for DEL_STATE message from
- * chaincode and sends back response with empty payload
+ * Simulates delState() invocation in chaincode Waits for DEL_STATE message from chaincode and sends back response with
+ * empty payload
  */
 public final class DelValueStep implements ScenarioStep {
     private ChaincodeMessage orgMsg;
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/ErrorResponseStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/ErrorResponseStep.java
index fae2dd60..96e63c7a 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/ErrorResponseStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/ErrorResponseStep.java
@@ -7,12 +7,9 @@
 
 import java.util.Collections;
 import java.util.List;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 
-/**
- * Error message from chaincode side, no response sent
- */
+/** Error message from chaincode side, no response sent */
 public final class ErrorResponseStep implements ScenarioStep {
     @Override
     public boolean expected(final ChaincodeMessage msg) {
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetHistoryForKeyStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetHistoryForKeyStep.java
index 813732ee..96e2fcc0 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetHistoryForKeyStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetHistoryForKeyStep.java
@@ -7,16 +7,14 @@
 
 import static java.util.stream.Collectors.toList;
 
+import com.google.protobuf.ByteString;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.hyperledger.fabric.protos.ledger.queryresult.KeyModification;
+import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.QueryResponse;
 import org.hyperledger.fabric.protos.peer.QueryResultBytes;
-import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
-
-import com.google.protobuf.ByteString;
 
 public final class GetHistoryForKeyStep implements ScenarioStep {
     private ChaincodeMessage orgMsg;
@@ -27,7 +25,7 @@ public final class GetHistoryForKeyStep implements ScenarioStep {
      * Initiate step
      *
      * @param hasNext is response message QueryResponse hasMore field set
-     * @param vals    list of keys to generate ("key" => "key Value") pairs
+     * @param vals list of keys to generate ("key" => "key Value") pairs
      */
     public GetHistoryForKeyStep(final boolean hasNext, final String... vals) {
         this.values = vals;
@@ -42,14 +40,17 @@ public boolean expected(final ChaincodeMessage msg) {
 
     @Override
     public List next() {
-        final List keyModifications = Arrays.asList(values).stream().map(x -> KeyModification.newBuilder()
-                .setTxId(x)
-                .setValue(ByteString.copyFromUtf8(x + " Value"))
-                .build()).collect(toList());
+        final List keyModifications = Arrays.asList(values).stream()
+                .map(x -> KeyModification.newBuilder()
+                        .setTxId(x)
+                        .setValue(ByteString.copyFromUtf8(x + " Value"))
+                        .build())
+                .collect(toList());
 
         final QueryResponse.Builder builder = QueryResponse.newBuilder();
         builder.setHasMore(hasNext);
-        keyModifications.stream().forEach(kv -> builder.addResults(QueryResultBytes.newBuilder().setResultBytes(kv.toByteString())));
+        keyModifications.stream()
+                .forEach(kv -> builder.addResults(QueryResultBytes.newBuilder().setResultBytes(kv.toByteString())));
         final ByteString historyPayload = builder.build().toByteString();
 
         final List list = new ArrayList<>();
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetQueryResultStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetQueryResultStep.java
index 00207270..2c137d93 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetQueryResultStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetQueryResultStep.java
@@ -8,8 +8,8 @@
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 
 /**
- * Simulates query invocation. Waits for GET_QUERY_RESULT Returns message that
- * contains list of results in form ("key" => "key Value")*
+ * Simulates query invocation. Waits for GET_QUERY_RESULT Returns message that contains list of results in form ("key"
+ * => "key Value")*
  */
 public final class GetQueryResultStep extends QueryResultStep {
 
@@ -17,7 +17,7 @@ public final class GetQueryResultStep extends QueryResultStep {
      * Initiate step
      *
      * @param hasNext is response message QueryResponse hasMore field set
-     * @param vals    list of keys to generate ("key" => "key Value") pairs
+     * @param vals list of keys to generate ("key" => "key Value") pairs
      */
     public GetQueryResultStep(final boolean hasNext, final String... vals) {
         super(hasNext, vals);
@@ -28,5 +28,4 @@ public boolean expected(final ChaincodeMessage msg) {
         super.orgMsg = msg;
         return msg.getType() == ChaincodeMessage.Type.GET_QUERY_RESULT;
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetStateByRangeStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetStateByRangeStep.java
index fc87811d..0acebac6 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetStateByRangeStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetStateByRangeStep.java
@@ -8,8 +8,8 @@
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 
 /**
- * Simulates getStateByRange Waits for GET_STATE_BY_RANGE message Returns
- * message that contains list of results in form ("key" => "key Value")*
+ * Simulates getStateByRange Waits for GET_STATE_BY_RANGE message Returns message that contains list of results in form
+ * ("key" => "key Value")*
  */
 public final class GetStateByRangeStep extends QueryResultStep {
 
@@ -17,7 +17,7 @@ public final class GetStateByRangeStep extends QueryResultStep {
      * Initiate step
      *
      * @param hasNext is response message QueryResponse hasMore field set
-     * @param vals    list of keys to generate ("key" => "key Value") pairs
+     * @param vals list of keys to generate ("key" => "key Value") pairs
      */
     public GetStateByRangeStep(final boolean hasNext, final String... vals) {
         super(hasNext, vals);
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetStateMetadata.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetStateMetadata.java
index 6d085fe5..8419ee2d 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetStateMetadata.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetStateMetadata.java
@@ -5,28 +5,23 @@
  */
 package org.hyperledger.fabric.shim.mock.peer;
 
+import com.google.protobuf.ByteString;
 import java.util.ArrayList;
 import java.util.List;
-
-import org.hyperledger.fabric.protos.peer.StateMetadata;
-import org.hyperledger.fabric.protos.peer.StateMetadataResult;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.MetaDataKeys;
+import org.hyperledger.fabric.protos.peer.StateMetadata;
+import org.hyperledger.fabric.protos.peer.StateMetadataResult;
 import org.hyperledger.fabric.shim.ext.sbe.StateBasedEndorsement;
 
-import com.google.protobuf.ByteString;
-
 /**
- * simulates Handler.getStateMetadata Waits for GET_STATE_METADATA message
- * Returns response message with stored metadata
+ * simulates Handler.getStateMetadata Waits for GET_STATE_METADATA message Returns response message with stored metadata
  */
 public final class GetStateMetadata implements ScenarioStep {
     private ChaincodeMessage orgMsg;
     private final byte[] val;
 
-    /**
-     * @param sbe StateBasedEndorsement to return as one and only one metadata entry
-     */
+    /** @param sbe StateBasedEndorsement to return as one and only one metadata entry */
     public GetStateMetadata(final StateBasedEndorsement sbe) {
         val = sbe.policy();
     }
@@ -45,9 +40,8 @@ public List next() {
                 .setValue(ByteString.copyFrom(val))
                 .build();
         entriesList.add(validationValue);
-        final StateMetadataResult stateMetadataResult = StateMetadataResult.newBuilder()
-                .addAllEntries(entriesList)
-                .build();
+        final StateMetadataResult stateMetadataResult =
+                StateMetadataResult.newBuilder().addAllEntries(entriesList).build();
         final List list = new ArrayList<>();
         list.add(ChaincodeMessage.newBuilder()
                 .setType(ChaincodeMessage.Type.RESPONSE)
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetValueStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetValueStep.java
index 67070196..6bac3ac3 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetValueStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/GetValueStep.java
@@ -5,25 +5,17 @@
  */
 package org.hyperledger.fabric.shim.mock.peer;
 
+import com.google.protobuf.ByteString;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 
-import com.google.protobuf.ByteString;
-
-/**
- * Simulates getState Waits for GET_STATE message Returns response message with
- * value as payload
- */
+/** Simulates getState Waits for GET_STATE message Returns response message with value as payload */
 public final class GetValueStep implements ScenarioStep {
     private ChaincodeMessage orgMsg;
     private final String val;
 
-    /**
-     *
-     * @param val value to return
-     */
+    /** @param val value to return */
     public GetValueStep(final String val) {
         this.val = val;
     }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/InvokeChaincodeStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/InvokeChaincodeStep.java
index 9ca3b547..dceae3b3 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/InvokeChaincodeStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/InvokeChaincodeStep.java
@@ -5,18 +5,16 @@
  */
 package org.hyperledger.fabric.shim.mock.peer;
 
+import com.google.protobuf.ByteString;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.Response;
 import org.hyperledger.fabric.shim.Chaincode;
 
-import com.google.protobuf.ByteString;
-
 /**
- * Simulates another chaincode invocation Waits for INVOKE_CHAINCODE Sends back
- * RESPONSE message with chaincode response inside
+ * Simulates another chaincode invocation Waits for INVOKE_CHAINCODE Sends back RESPONSE message with chaincode response
+ * inside
  */
 public final class InvokeChaincodeStep implements ScenarioStep {
     private ChaincodeMessage orgMsg;
@@ -28,22 +26,22 @@ public boolean expected(final ChaincodeMessage msg) {
     }
 
     /**
-     *
-     * @return Chaincode response packed as payload inside COMPLETE message packed
-     *         as payload inside RESPONSE message
+     * @return Chaincode response packed as payload inside COMPLETE message packed as payload inside RESPONSE message
      */
     @Override
     public List next() {
         final ByteString chaincodeResponse = Response.newBuilder()
                 .setStatus(Chaincode.Response.Status.SUCCESS.getCode())
                 .setMessage("OK")
-                .build().toByteString();
+                .build()
+                .toByteString();
         final ByteString completePayload = ChaincodeMessage.newBuilder()
                 .setType(ChaincodeMessage.Type.COMPLETED)
                 .setChannelId(orgMsg.getChannelId())
                 .setTxid(orgMsg.getTxid())
                 .setPayload(chaincodeResponse)
-                .build().toByteString();
+                .build()
+                .toByteString();
         final List list = new ArrayList<>();
         list.add(ChaincodeMessage.newBuilder()
                 .setType(ChaincodeMessage.Type.RESPONSE)
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/PurgeValueStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/PurgeValueStep.java
index b048295d..e6eed042 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/PurgeValueStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/PurgeValueStep.java
@@ -7,12 +7,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 
 /**
- * Simulates purgePrivateData() invocation in chaincode Waits for PURGE_PRIVATE_DATA message from
- * chaincode and sends back response with empty payload
+ * Simulates purgePrivateData() invocation in chaincode Waits for PURGE_PRIVATE_DATA message from chaincode and sends
+ * back response with empty payload
  */
 public final class PurgeValueStep implements ScenarioStep {
 
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/PutStateMetadata.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/PutStateMetadata.java
index 156f7353..95d80e03 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/PutStateMetadata.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/PutStateMetadata.java
@@ -5,20 +5,17 @@
  */
 package org.hyperledger.fabric.shim.mock.peer;
 
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.MetaDataKeys;
 import org.hyperledger.fabric.shim.ext.sbe.StateBasedEndorsement;
 import org.hyperledger.fabric.shim.ext.sbe.impl.StateBasedEndorsementFactory;
 
-import com.google.protobuf.InvalidProtocolBufferException;
-
 /**
- * * Simulates Handler.putStateMetadata() invocation from chaincode side * Waits
- * for PUT_STATE_METADATA message from chaincode, including metadata entry with
- * validation metadata and sends back response with empty payload
+ * * Simulates Handler.putStateMetadata() invocation from chaincode side * Waits for PUT_STATE_METADATA message from
+ * chaincode, including metadata entry with validation metadata and sends back response with empty payload
  */
 public final class PutStateMetadata implements ScenarioStep {
     private ChaincodeMessage orgMsg;
@@ -29,8 +26,7 @@ public PutStateMetadata(final StateBasedEndorsement sbe) {
     }
 
     /**
-     * Check incoming message If message type is PUT_STATE_METADATA and payload
-     * match to passed in constructor
+     * Check incoming message If message type is PUT_STATE_METADATA and payload match to passed in constructor
      *
      * @param msg message from chaincode
      * @return
@@ -44,9 +40,12 @@ public boolean expected(final ChaincodeMessage msg) {
         } catch (final InvalidProtocolBufferException e) {
             return false;
         }
-        final StateBasedEndorsement msgSbe = StateBasedEndorsementFactory.getInstance().newStateBasedEndorsement(psm.getMetadata().getValue().toByteArray());
+        final StateBasedEndorsement msgSbe = StateBasedEndorsementFactory.getInstance()
+                .newStateBasedEndorsement(psm.getMetadata().getValue().toByteArray());
         return msg.getType() == ChaincodeMessage.Type.PUT_STATE_METADATA
-                && MetaDataKeys.VALIDATION_PARAMETER.toString().equals(psm.getMetadata().getMetakey())
+                && MetaDataKeys.VALIDATION_PARAMETER
+                        .toString()
+                        .equals(psm.getMetadata().getMetakey())
                 && (msgSbe.listOrgs().size() == val.listOrgs().size());
     }
 
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/PutValueStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/PutValueStep.java
index 6dc16d47..b96e7425 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/PutValueStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/PutValueStep.java
@@ -6,18 +6,16 @@
 
 package org.hyperledger.fabric.shim.mock.peer;
 
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-
-import org.hyperledger.fabric.protos.peer.PutState;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
-
-import com.google.protobuf.InvalidProtocolBufferException;
+import org.hyperledger.fabric.protos.peer.PutState;
 
 /**
- * Simulates putState() invocation in chaincode Waits for PUT_STATE message from
- * chaincode, including value and sends back response with empty payload
+ * Simulates putState() invocation in chaincode Waits for PUT_STATE message from chaincode, including value and sends
+ * back response with empty payload
  */
 public final class PutValueStep implements ScenarioStep {
     private ChaincodeMessage orgMsg;
@@ -33,8 +31,7 @@ public PutValueStep(final String val) {
     }
 
     /**
-     * Check incoming message If message type is PUT_STATE and payload equal to
-     * passed in constructor
+     * Check incoming message If message type is PUT_STATE and payload equal to passed in constructor
      *
      * @param msg message from chaincode
      * @return
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/QueryCloseStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/QueryCloseStep.java
index e282b23d..501ed1ce 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/QueryCloseStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/QueryCloseStep.java
@@ -7,12 +7,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 
 /**
- * Simulate last query (close) step. Happens after passing over all query result
- * Waits for QUERY_STATE_CLOSE Sends back response with empty payload
+ * Simulate last query (close) step. Happens after passing over all query result Waits for QUERY_STATE_CLOSE Sends back
+ * response with empty payload
  */
 public final class QueryCloseStep implements ScenarioStep {
     private ChaincodeMessage orgMsg;
@@ -23,10 +22,7 @@ public boolean expected(final ChaincodeMessage msg) {
         return msg.getType() == ChaincodeMessage.Type.QUERY_STATE_CLOSE;
     }
 
-    /**
-     *
-     * @return RESPONSE message with empty payload
-     */
+    /** @return RESPONSE message with empty payload */
     @Override
     public List next() {
         final List list = new ArrayList<>();
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/QueryNextStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/QueryNextStep.java
index fced5b3e..331b15e3 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/QueryNextStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/QueryNextStep.java
@@ -8,9 +8,8 @@
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 
 /**
- * Simulates requesting/receiving next set of results for query Waits for
- * QUERY_STATE_NEXT Returns message that contains list of results in form ("key"
- * => "key Value")*
+ * Simulates requesting/receiving next set of results for query Waits for QUERY_STATE_NEXT Returns message that contains
+ * list of results in form ("key" => "key Value")*
  */
 public final class QueryNextStep extends QueryResultStep {
 
@@ -18,7 +17,7 @@ public final class QueryNextStep extends QueryResultStep {
      * Initiate step
      *
      * @param hasNext is response message QueryResponse hasMore field set
-     * @param vals    list of keys to generate ("key" => "key Value") pairs
+     * @param vals list of keys to generate ("key" => "key Value") pairs
      */
     public QueryNextStep(final boolean hasNext, final String... vals) {
         super(hasNext, vals);
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/QueryResultStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/QueryResultStep.java
index cab82313..26c52724 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/QueryResultStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/QueryResultStep.java
@@ -7,20 +7,16 @@
 
 import static java.util.stream.Collectors.toList;
 
+import com.google.protobuf.ByteString;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.hyperledger.fabric.protos.ledger.queryresult.KV;
-import org.hyperledger.fabric.protos.peer.QueryResultBytes;
-import org.hyperledger.fabric.protos.peer.QueryResponse;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
+import org.hyperledger.fabric.protos.peer.QueryResponse;
+import org.hyperledger.fabric.protos.peer.QueryResultBytes;
 
-import com.google.protobuf.ByteString;
-
-/**
- * Base class for multi result query steps/messages
- */
+/** Base class for multi result query steps/messages */
 public abstract class QueryResultStep implements ScenarioStep {
     protected ChaincodeMessage orgMsg;
     protected final String[] values;
@@ -30,7 +26,7 @@ public abstract class QueryResultStep implements ScenarioStep {
      * Initiate step
      *
      * @param hasNext is response message QueryResponse hasMore field set
-     * @param vals    list of keys to generate ("key" => "key Value") pairs
+     * @param vals list of keys to generate ("key" => "key Value") pairs
      */
     QueryResultStep(final boolean hasNext, final String... vals) {
         this.values = vals;
@@ -44,14 +40,17 @@ public abstract class QueryResultStep implements ScenarioStep {
      */
     @Override
     public List next() {
-        final List keyValues = Arrays.asList(values).stream().map(x -> KV.newBuilder()
-                .setKey(x)
-                .setValue(ByteString.copyFromUtf8(x + " Value"))
-                .build()).collect(toList());
+        final List keyValues = Arrays.asList(values).stream()
+                .map(x -> KV.newBuilder()
+                        .setKey(x)
+                        .setValue(ByteString.copyFromUtf8(x + " Value"))
+                        .build())
+                .collect(toList());
 
         final QueryResponse.Builder builder = QueryResponse.newBuilder();
         builder.setHasMore(hasNext);
-        keyValues.stream().forEach(kv -> builder.addResults(QueryResultBytes.newBuilder().setResultBytes(kv.toByteString())));
+        keyValues.stream()
+                .forEach(kv -> builder.addResults(QueryResultBytes.newBuilder().setResultBytes(kv.toByteString())));
         final ByteString rangePayload = builder.build().toByteString();
 
         final List list = new ArrayList<>();
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/RegisterStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/RegisterStep.java
index 81f823bd..25c66c42 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/RegisterStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/RegisterStep.java
@@ -8,12 +8,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 
 /**
- * Simulates chaincode registration after start Waits for REGISTER message from
- * chaincode Sends back pair of messages: REGISTERED and READY
+ * Simulates chaincode registration after start Waits for REGISTER message from chaincode Sends back pair of messages:
+ * REGISTERED and READY
  */
 public final class RegisterStep implements ScenarioStep {
 
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/ScenarioStep.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/ScenarioStep.java
index f913ea6c..d219b405 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/ScenarioStep.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/mock/peer/ScenarioStep.java
@@ -7,7 +7,6 @@
 package org.hyperledger.fabric.shim.mock.peer;
 
 import java.util.List;
-
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 
 public interface ScenarioStep {
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/utils/MessageUtil.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/utils/MessageUtil.java
index dc0f4fa0..b6ab6a5c 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/utils/MessageUtil.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/utils/MessageUtil.java
@@ -6,16 +6,13 @@
 
 package org.hyperledger.fabric.shim.utils;
 
+import com.google.protobuf.ByteString;
 import org.hyperledger.fabric.protos.peer.ChaincodeEvent;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 
-import com.google.protobuf.ByteString;
-
 public final class MessageUtil {
 
-    private MessageUtil() {
-
-    }
+    private MessageUtil() {}
 
     /**
      * Generate chaincode messages
@@ -27,8 +24,12 @@ private MessageUtil() {
      * @param event
      * @return
      */
-    public static ChaincodeMessage newEventMessage(final ChaincodeMessage.Type type, final String channelId, final String txId,
-            final ByteString payload, final ChaincodeEvent event) {
+    public static ChaincodeMessage newEventMessage(
+            final ChaincodeMessage.Type type,
+            final String channelId,
+            final String txId,
+            final ByteString payload,
+            final ChaincodeEvent event) {
         final ChaincodeMessage.Builder builder = ChaincodeMessage.newBuilder()
                 .setType(type)
                 .setChannelId(channelId)
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/utils/TimeoutUtil.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/utils/TimeoutUtil.java
index 6216363d..12836483 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/utils/TimeoutUtil.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/utils/TimeoutUtil.java
@@ -11,16 +11,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-/**
- * Give possibility to stop runnable execution after specific time, if not ended
- */
+/** Give possibility to stop runnable execution after specific time, if not ended */
 public final class TimeoutUtil {
 
-    private TimeoutUtil() {
-
-    }
+    private TimeoutUtil() {}
 
-    public static void runWithTimeout(final Runnable callable, final long timeout, final TimeUnit timeUnit) throws Exception {
+    public static void runWithTimeout(final Runnable callable, final long timeout, final TimeUnit timeUnit)
+            throws Exception {
         final ExecutorService executor = Executors.newSingleThreadExecutor();
         final CountDownLatch latch = new CountDownLatch(1);
         final Thread t = new Thread(() -> {
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/TracesTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/TracesTest.java
index 38bf768a..51e0a1bf 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/TracesTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/TracesTest.java
@@ -5,33 +5,28 @@
  */
 package org.hyperledger.fabric.traces;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.opentelemetry.api.trace.Span;
-import org.hyperledger.fabric.traces.impl.DefaultTracesProvider;
+import java.util.Properties;
 import org.hyperledger.fabric.shim.ChaincodeStub;
+import org.hyperledger.fabric.traces.impl.DefaultTracesProvider;
 import org.hyperledger.fabric.traces.impl.NullProvider;
 import org.hyperledger.fabric.traces.impl.OpenTelemetryTracesProvider;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
-import java.util.Properties;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 public class TracesTest {
 
     public static final class TestProvider implements TracesProvider {
 
-        public TestProvider() {
-
-        }
+        public TestProvider() {}
 
         @Override
-        public void initialize(final Properties props) {
-        }
+        public void initialize(final Properties props) {}
 
         @Override
         public Span createSpan(final ChaincodeStub stub) {
@@ -55,9 +50,12 @@ public void tracesEnabledUnknownProvider() {
             props.put("CHAINCODE_TRACES_PROVIDER", "org.example.traces.provider");
             props.put("CHAINCODE_TRACES_ENABLED", "true");
 
-            assertThrows(RuntimeException.class, () -> {
-                final TracesProvider provider = Traces.initialize(props);
-            }, "Unable to start traces");
+            assertThrows(
+                    RuntimeException.class,
+                    () -> {
+                        final TracesProvider provider = Traces.initialize(props);
+                    },
+                    "Unable to start traces");
         }
 
         @Test
@@ -67,7 +65,6 @@ public void tracesNoProvider() {
 
             final TracesProvider provider = Traces.initialize(props);
             assertTrue(provider instanceof DefaultTracesProvider);
-
         }
 
         @Test
@@ -78,7 +75,6 @@ public void tracesOpenTelemetryProvider() {
 
             final TracesProvider provider = Traces.initialize(props);
             assertTrue(provider instanceof OpenTelemetryTracesProvider);
-
         }
 
         @Test
@@ -90,6 +86,5 @@ public void tracesValid() {
 
             assertThat(provider).isExactlyInstanceOf(TracesTest.TestProvider.class);
         }
-
     }
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/DefaultProviderTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/DefaultProviderTest.java
index 7740b341..e36075fd 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/DefaultProviderTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/DefaultProviderTest.java
@@ -5,13 +5,13 @@
  */
 package org.hyperledger.fabric.traces.impl;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import io.opentelemetry.api.trace.Span;
 import org.hyperledger.fabric.contract.ChaincodeStubNaiveImpl;
 import org.hyperledger.fabric.shim.ChaincodeStub;
 import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class DefaultProviderTest {
 
     @Test
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/OpenTelemetryPropertiesTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/OpenTelemetryPropertiesTest.java
index fca985db..9c9278be 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/OpenTelemetryPropertiesTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/OpenTelemetryPropertiesTest.java
@@ -5,15 +5,6 @@
  */
 package org.hyperledger.fabric.traces.impl;
 
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
-import org.junit.jupiter.api.Test;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 import static java.time.temporal.ChronoUnit.DAYS;
 import static java.time.temporal.ChronoUnit.HOURS;
 import static java.time.temporal.ChronoUnit.MILLIS;
@@ -22,11 +13,20 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
 public class OpenTelemetryPropertiesTest {
 
     @Test
     public void testOverrideValue() {
-        OpenTelemetryProperties props = new OpenTelemetryProperties(Collections.singletonMap("foo", "bar"), Collections.singletonMap("foo", "foobar"));
+        OpenTelemetryProperties props = new OpenTelemetryProperties(
+                Collections.singletonMap("foo", "bar"), Collections.singletonMap("foo", "foobar"));
         assertThat(props.getString("foo")).isEqualTo("foobar");
     }
 
@@ -42,7 +42,6 @@ public void testCanGetDurationHours() {
         assertThat(props.getDuration("foo")).isEqualTo(Duration.of(5, HOURS));
     }
 
-
     @Test
     public void testCanGetDurationMinutes() {
         OpenTelemetryProperties props = new OpenTelemetryProperties(Collections.singletonMap("foo", "5m"));
@@ -87,7 +86,6 @@ public void testGetLong() {
         assertThat(props.getLong("bar")).isNull();
     }
 
-
     @Test
     public void testGetInt() {
         OpenTelemetryProperties props = new OpenTelemetryProperties(Collections.singletonMap("foo", "500003"));
@@ -111,7 +109,8 @@ public void testGetList() {
 
     @Test
     public void testGetMap() {
-        OpenTelemetryProperties props = new OpenTelemetryProperties(Collections.singletonMap("foo", "foo=bar,foobar=noes"));
+        OpenTelemetryProperties props =
+                new OpenTelemetryProperties(Collections.singletonMap("foo", "foo=bar,foobar=noes"));
         Map expected = new HashMap<>();
         expected.put("foo", "bar");
         expected.put("foobar", "noes");
@@ -120,7 +119,8 @@ public void testGetMap() {
 
     @Test
     public void testGetMapInvalid() {
-        OpenTelemetryProperties props = new OpenTelemetryProperties(Collections.singletonMap("foo", "foo/bar,foobar/noes"));
+        OpenTelemetryProperties props =
+                new OpenTelemetryProperties(Collections.singletonMap("foo", "foo/bar,foobar/noes"));
         Map expected = new HashMap<>();
         assertThatThrownBy(() -> props.getMap("foo")).isInstanceOf(ConfigurationException.class);
     }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/OpenTelemetryTracesProviderTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/OpenTelemetryTracesProviderTest.java
index 7b03a3f2..6aeda3e8 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/OpenTelemetryTracesProviderTest.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/OpenTelemetryTracesProviderTest.java
@@ -5,6 +5,8 @@
  */
 package org.hyperledger.fabric.traces.impl;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.Server;
 import io.grpc.ServerCall;
@@ -17,10 +19,14 @@
 import io.grpc.stub.StreamObserver;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.sdk.trace.data.SpanData;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 import org.hyperledger.fabric.contract.ChaincodeStubNaiveImpl;
 import org.hyperledger.fabric.metrics.Metrics;
-import org.hyperledger.fabric.protos.peer.ChaincodeID;
 import org.hyperledger.fabric.protos.peer.ChaincodeGrpc;
+import org.hyperledger.fabric.protos.peer.ChaincodeID;
 import org.hyperledger.fabric.protos.peer.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.ChaincodeSupportGrpc;
 import org.hyperledger.fabric.shim.ChaincodeBase;
@@ -31,13 +37,6 @@
 import org.hyperledger.fabric.traces.Traces;
 import org.junit.jupiter.api.Test;
 
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 public final class OpenTelemetryTracesProviderTest {
 
     private final class ContextGetterChaincode extends ChaincodeBase {
@@ -58,7 +57,6 @@ public Properties getChaincodeConfig() {
         }
     }
 
-
     @Test
     public void testProvider() {
         OpenTelemetryTracesProvider provider = new OpenTelemetryTracesProvider();
@@ -84,33 +82,35 @@ public void testTracing() throws Exception {
         // set up a grpc server in process
         ServerCallHandler handler = (call, headers) -> {
             call.close(Status.OK, headers);
-            return new ServerCall.Listener() {
-            };
+            return new ServerCall.Listener() {};
         };
 
-        ServerServiceDefinition.Builder builder = ServerServiceDefinition.builder(ChaincodeGrpc.getServiceDescriptor()).
-                addMethod(ServerMethodDefinition.create(ChaincodeGrpc.getConnectMethod(), handler));
-        ServerServiceDefinition.Builder supportBuilder = ServerServiceDefinition.builder(ChaincodeSupportGrpc.getServiceDescriptor()).
-                addMethod(ServerMethodDefinition.create(ChaincodeSupportGrpc.getRegisterMethod(), handler));
+        ServerServiceDefinition.Builder builder = ServerServiceDefinition.builder(ChaincodeGrpc.getServiceDescriptor())
+                .addMethod(ServerMethodDefinition.create(ChaincodeGrpc.getConnectMethod(), handler));
+        ServerServiceDefinition.Builder supportBuilder = ServerServiceDefinition.builder(
+                        ChaincodeSupportGrpc.getServiceDescriptor())
+                .addMethod(ServerMethodDefinition.create(ChaincodeSupportGrpc.getRegisterMethod(), handler));
 
         String uniqueName = InProcessServerBuilder.generateName();
         Server server = InProcessServerBuilder.forName(uniqueName)
                 .directExecutor()
                 .addService(builder.build())
                 .addService(supportBuilder.build())
-                .build().start();
+                .build()
+                .start();
 
         // create our client
         ManagedChannelBuilder channelBuilder = InProcessChannelBuilder.forName(uniqueName);
         ContextGetterChaincode chaincode = new ContextGetterChaincode();
         ChaincodeSupportClient chaincodeSupportClient = new ChaincodeSupportClient(channelBuilder);
 
-        InvocationTaskManager itm = InvocationTaskManager.getManager(chaincode, ChaincodeID.newBuilder().setName("foo").build());
+        InvocationTaskManager itm = InvocationTaskManager.getManager(
+                chaincode, ChaincodeID.newBuilder().setName("foo").build());
 
         CompletableFuture wait = new CompletableFuture<>();
-        StreamObserver requestObserver = chaincodeSupportClient.getStub().register(
-
-                new StreamObserver() {
+        StreamObserver requestObserver = chaincodeSupportClient
+                .getStub()
+                .register(new StreamObserver() {
                     @Override
                     public void onNext(final ChaincodeMessage chaincodeMessage) {
                         // message off to the ITM...
@@ -128,9 +128,7 @@ public void onCompleted() {
                         chaincodeSupportClient.shutdown(itm);
                         wait.complete(null);
                     }
-                }
-
-        );
+                });
 
         chaincodeSupportClient.start(itm, requestObserver);
         wait.get(5, TimeUnit.SECONDS);
@@ -141,5 +139,4 @@ public void onCompleted() {
         chaincodeSupportClient.shutdown(itm);
         server.shutdown();
     }
-
 }
diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/TestSpanExporterProvider.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/TestSpanExporterProvider.java
index 2bfa9bd6..5baa2ff9 100644
--- a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/TestSpanExporterProvider.java
+++ b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/traces/impl/TestSpanExporterProvider.java
@@ -10,7 +10,6 @@
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000..1dc4fe86
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,5 @@
+[versions]
+spotless = "6.25.0"
+
+[plugins]
+spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd4917707c1f8861d8cb53dd15194d4248596..a4b76b9530d66f5e68d973ea569d8e19de379189 100644
GIT binary patch
delta 34592
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

delta 34555
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0aaefbca..df97d72b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a42..f5feea6d 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 7101f8e4..9b42019c 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/settings.gradle b/settings.gradle
index c384cfad..3837c43e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,4 +7,4 @@ rootProject.name = 'fabric-chaincode-java'
 
 include 'fabric-chaincode-shim'
 include 'fabric-chaincode-docker'
-include 'fabric-chaincode-integration-test'
\ No newline at end of file
+include 'fabric-chaincode-integration-test'