diff --git a/pom.xml b/pom.xml
index fe4df341..94950ec4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,31 +56,31 @@
org.junit.platform
junit-platform-launcher
- 1.6.2
+ 1.8.2
test
org.junit.jupiter
junit-jupiter-engine
- 5.6.2
+ 5.8.2
test
org.junit.jupiter
junit-jupiter-params
- 5.6.2
+ 5.8.2
test
org.junit.vintage
junit-vintage-engine
- 5.6.2
+ 5.8.2
test
org.assertj
assertj-core
- 3.16.1
+ 3.22.0
test
@@ -91,30 +91,30 @@
org.mockito
mockito-core
- 3.3.3
+ 4.3.1
test
io.cucumber
cucumber-java8
- 5.7.0
+ 7.2.3
test
io.cucumber
cucumber-junit
- 5.7.0
+ 7.2.3
test
commons-codec
commons-codec
- 1.14
+ 1.15
com.ibm.cloud
cloudant
- 0.0.32
+ 0.0.34
@@ -263,7 +263,7 @@
org.apache.maven.plugins
maven-checkstyle-plugin
- 3.1.0
+ 3.1.2
checkstyle.xml
UTF-8
@@ -276,7 +276,7 @@
com.puppycrawl.tools
checkstyle
- 8.30
+ 9.3
diff --git a/src/main/java/org/hyperledger/fabric/gateway/impl/identity/WalletImpl.java b/src/main/java/org/hyperledger/fabric/gateway/impl/identity/WalletImpl.java
index d48ff363..c360846a 100644
--- a/src/main/java/org/hyperledger/fabric/gateway/impl/identity/WalletImpl.java
+++ b/src/main/java/org/hyperledger/fabric/gateway/impl/identity/WalletImpl.java
@@ -64,15 +64,16 @@ private InputStream serializeJson(final JsonObject identityJson) {
@Override
public Identity get(final String label) throws IOException {
- final InputStream identityData = store.get(label);
- if (identityData == null) {
- return null;
- }
+ try (InputStream identityData = store.get(label)) {
+ if (identityData == null) {
+ return null;
+ }
- try {
- return deserializeIdentity(identityData);
- } catch (RuntimeException e) {
- throw new IOException(e);
+ try {
+ return deserializeIdentity(identityData);
+ } catch (RuntimeException e) {
+ throw new IOException(e);
+ }
}
}
diff --git a/src/test/java/org/hyperledger/fabric/gateway/impl/TransactionTest.java b/src/test/java/org/hyperledger/fabric/gateway/impl/TransactionTest.java
index 2914f283..f79e2924 100644
--- a/src/test/java/org/hyperledger/fabric/gateway/impl/TransactionTest.java
+++ b/src/test/java/org/hyperledger/fabric/gateway/impl/TransactionTest.java
@@ -17,7 +17,6 @@
import org.hyperledger.fabric.gateway.Contract;
import org.hyperledger.fabric.gateway.ContractException;
-import org.hyperledger.fabric.gateway.DefaultCommitHandlers;
import org.hyperledger.fabric.gateway.Gateway;
import org.hyperledger.fabric.gateway.GatewayException;
import org.hyperledger.fabric.gateway.Network;
@@ -29,17 +28,16 @@
import org.hyperledger.fabric.sdk.HFClient;
import org.hyperledger.fabric.sdk.Peer;
import org.hyperledger.fabric.sdk.ProposalResponse;
-import org.hyperledger.fabric.sdk.QueryByChaincodeRequest;
import org.hyperledger.fabric.sdk.TransactionProposalRequest;
-import org.hyperledger.fabric.sdk.TransactionRequest;
-import org.hyperledger.fabric.sdk.User;
import org.hyperledger.fabric.sdk.transaction.TransactionContext;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
-import org.mockito.MockitoAnnotations;
+import org.mockito.Mockito;
+import org.mockito.MockitoSession;
+import org.mockito.quality.Strictness;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -57,6 +55,7 @@
public class TransactionTest {
private final TestUtils testUtils = TestUtils.getInstance();
private final TimePeriod timeout = new TimePeriod(7, TimeUnit.DAYS);
+ private MockitoSession mockitoSession;
private Gateway.Builder gatewayBuilder;
private Gateway gateway;
private Channel channel;
@@ -79,7 +78,10 @@ public class TransactionTest {
@BeforeEach
public void setup() throws Exception {
- MockitoAnnotations.initMocks(this);
+ mockitoSession = Mockito.mockitoSession()
+ .initMocks(this)
+ .strictness(Strictness.LENIENT)
+ .startMocking();
peer1 = testUtils.newMockPeer("peer1");
peer2 = testUtils.newMockPeer("peer2");
@@ -117,6 +119,7 @@ public CommitHandler create(final String transactionId, final Network network) {
@AfterEach
public void afterEach() {
gateway.close();
+ mockitoSession.finishMocking();
}
@Test
diff --git a/src/test/java/scenario/RunScenarioTest.java b/src/test/java/scenario/RunScenarioTest.java
index 1ebcf0df..94b0feb1 100644
--- a/src/test/java/scenario/RunScenarioTest.java
+++ b/src/test/java/scenario/RunScenarioTest.java
@@ -6,6 +6,6 @@
import io.cucumber.junit.CucumberOptions;
@RunWith(Cucumber.class)
-@CucumberOptions(plugin = {"pretty"}, strict = true)
+@CucumberOptions(plugin = {"pretty"})
public class RunScenarioTest {
}