KEYCLOAK-15238: Fix potential resource leak from not closing Stream/Reader

This commit is contained in:
testn
2020-08-21 19:29:11 +07:00
committed by Hynek Mlnařík
parent bd3840c606
commit 2cd03569d6
18 changed files with 90 additions and 68 deletions
@@ -232,7 +232,9 @@ public class FluentTestsHelper {
* @see #importTestRealm(InputStream)
*/
public FluentTestsHelper importTestRealm(String realmJsonPath) throws IOException {
return importTestRealm(FluentTestsHelper.class.getResourceAsStream(realmJsonPath));
try (InputStream fis = FluentTestsHelper.class.getResourceAsStream(realmJsonPath)) {
return importTestRealm(fis);
}
}
/**
@@ -158,20 +158,20 @@ public class TestsHelper {
public static boolean importTestRealm(String username, String password, String realmJsonPath) throws IOException {
ObjectMapper mapper = new ObjectMapper();
ClassLoader classLoader = TestsHelper.class.getClassLoader();
InputStream stream = TestsHelper.class.getResourceAsStream(realmJsonPath);
RealmRepresentation realmRepresentation = mapper.readValue(stream, RealmRepresentation.class);
try (InputStream stream = TestsHelper.class.getResourceAsStream(realmJsonPath)) {
RealmRepresentation realmRepresentation = mapper.readValue(stream, RealmRepresentation.class);
Keycloak keycloak = Keycloak.getInstance(
keycloakBaseUrl,
"master",
username,
password,
"admin-cli");
keycloak.realms().create(realmRepresentation);
testRealm = realmRepresentation.getRealm();
generateInitialAccessToken(keycloak);
return true;
Keycloak keycloak = Keycloak.getInstance(
keycloakBaseUrl,
"master",
username,
password,
"admin-cli");
keycloak.realms().create(realmRepresentation);
testRealm = realmRepresentation.getRealm();
generateInitialAccessToken(keycloak);
return true;
}
}