Skip to content
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

Update ACL tests and modify JedisPool tests #2325

Merged
merged 9 commits into from
Dec 24, 2020
Merged

Update ACL tests and modify JedisPool tests #2325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b51ca26
Test ACL with non-default user (standalone Redis instance)
sazzad16 Dec 23, 2020
5ed4db4
Modify JedisPool (w/wo ACL) tests
sazzad16 Dec 23, 2020
948f50a
Modify Jedis (w/wo ACL) tests
sazzad16 Dec 23, 2020
342aa47
Test related to issue #2318 and PR #2319
sazzad16 Dec 23, 2020
406dfa1
Update AccessControlListCommandsTest
sazzad16 Dec 23, 2020
96312ea
Adding one test in JedisPoolWithCompleteCredentialsTest
sazzad16 Dec 23, 2020
b9bf1ac
use try-with-resources in JedisPool tests
sazzad16 Dec 24, 2020
f43c5c9
Merge branch 'master' into acl-tests
gkorland Dec 24, 2020
4753cbf
Merge branch 'master' into acl-tests
gkorland Dec 24, 2020
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
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ daemonize yes
protected-mode no
port 6379
requirepass foobared
user acljedis on allcommands allkeys >fizzbuzz
pidfile /tmp/redis1.pid
logfile /tmp/redis1.log
save ""
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/redis/clients/jedis/JedisPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,15 @@ public JedisPool(final GenericObjectPoolConfig poolConfig, final String host, in
this(poolConfig, host, port, timeout, password, Protocol.DEFAULT_DATABASE);
}

public JedisPool(final String host, int port, String user, final String password) {
this(new GenericObjectPoolConfig(), host, port, user, password);
}

public JedisPool(final GenericObjectPoolConfig poolConfig, final String host, int port,
String user, final String password) {
this(poolConfig, host, port, Protocol.DEFAULT_TIMEOUT, user, password, Protocol.DEFAULT_DATABASE);
}

public JedisPool(final GenericObjectPoolConfig poolConfig, final String host, int port,
int timeout, final String user, final String password) {
this(poolConfig, host, port, timeout, user, password, Protocol.DEFAULT_DATABASE);
Expand Down
Loading