Skip to content

clean warns #2335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 7, 2021
Merged

clean warns #2335

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f3ce9dd
clean warns
gkorland Dec 30, 2020
e8ac4c4
Add more try-resource blocks
gkorland Dec 31, 2020
ff2addc
Merge branch 'master' into clean-warns
gkorland Feb 7, 2021
581eafb
Update RedisVersionUtil.java
gkorland Feb 7, 2021
f8a884e
Update src/test/java/redis/clients/jedis/tests/JedisSentinelPoolWithC…
gkorland Feb 7, 2021
9d98eb0
Update src/test/java/redis/clients/jedis/tests/JedisSentinelPoolWithC…
gkorland Feb 7, 2021
264a821
Update src/main/java/redis/clients/jedis/ZParams.java
sazzad16 Feb 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 21 additions & 26 deletions src/test/java/redis/clients/jedis/tests/JedisSentinelPoolWithCompleteCredentialsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ public void checkCloseableConnections() throws Exception {

JedisSentinelPool pool = new JedisSentinelPool(MASTER_NAME, sentinels, config, 1000,
"default","foobared", 2);
Jedis jedis = pool.getResource();
jedis.auth("default", "foobared");
jedis.set("foo", "bar");
assertEquals("bar", jedis.get("foo"));
jedis.close();
try(Jedis jedis = pool.getResource()){
jedis.auth("default", "foobared");
jedis.set("foo", "bar");
assertEquals("bar", jedis.get("foo"));
}
pool.close();
assertTrue(pool.isClosed());
}
Expand All @@ -128,24 +128,23 @@ public void returnResourceShouldResetState() {
GenericObjectPoolConfig config = new GenericObjectPoolConfig();
config.setMaxTotal(1);
config.setBlockWhenExhausted(false);
JedisSentinelPool pool = new JedisSentinelPool(MASTER_NAME, sentinels, config, 1000,
"default", "foobared", 2);

Jedis jedis = pool.getResource();
try {
jedis.set("hello", "jedis");
Transaction t = jedis.multi();
t.set("hello", "world");
jedis.close();
try (JedisSentinelPool pool = new JedisSentinelPool(MASTER_NAME, sentinels, config, 1000,
"default", "foobared", 2)){
Jedis jedis;
try (Jedis jedis1 = pool.getResource()){
jedis = jedis1;
jedis1.set("hello", "jedis");
Transaction t = jedis1.multi();
t.set("hello", "world");
jedis1.close();
}

try (Jedis jedis2 = pool.getResource()) {

assertSame(jedis, jedis2);
assertEquals("jedis", jedis2.get("hello"));
}
} finally {

pool.destroy();
}
}

Expand All @@ -157,11 +156,10 @@ public void checkResourceIsCloseable() {
try(JedisSentinelPool pool = new JedisSentinelPool(MASTER_NAME, sentinels, config, 1000,
"default", "foobared", 2)){

Jedis jedis = pool.getResource();
try {
jedis.set("hello", "jedis");
} finally {
jedis.close();
Jedis jedis;
try (Jedis jedis1 = pool.getResource()){
jedis = jedis1;
jedis1.set("hello", "jedis");
}

try (Jedis jedis2 = pool.getResource()){
Expand All @@ -178,12 +176,9 @@ public void customClientName() {
JedisSentinelPool pool = new JedisSentinelPool(MASTER_NAME, sentinels, config, 1000,
"default", "foobared", 0, "my_shiny_client_name");

Jedis jedis = pool.getResource();

try {
try (Jedis jedis = pool.getResource()){
assertEquals("my_shiny_client_name", jedis.clientGetname());
} finally {
jedis.close();
pool.destroy();
}

Expand Down