Skip to content

Fix mis-spelling of 'database' #2487

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 1 commit into from
Mar 24, 2021
Merged

Fix mis-spelling of 'database' #2487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/main/java/redis/clients/jedis/BinaryJedis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public BinaryJedis(final JedisShardInfo shardInfo) {
this(shardInfo.getHost(), shardInfo.getPort(), DefaultJedisClientConfig.builder()
.connectionTimeoutMillis(shardInfo.getConnectionTimeout())
.socketTimeoutMillis(shardInfo.getSoTimeout()).user(shardInfo.getUser())
.password(shardInfo.getPassword()).databse(shardInfo.getDb())
.password(shardInfo.getPassword()).database(shardInfo.getDb())
.ssl(shardInfo.getSsl()).sslSocketFactory(shardInfo.getSslSocketFactory())
.sslParameters(shardInfo.getSslParameters())
.hostnameVerifier(shardInfo.getHostnameVerifier()).build());
Expand Down Expand Up @@ -245,7 +245,7 @@ public BinaryJedis(final URI uri, JedisClientConfig config) {
.socketTimeoutMillis(config.getSocketTimeoutMillis())
.blockingSocketTimeoutMillis(config.getBlockingSocketTimeoutMillis())
.user(JedisURIHelper.getUser(uri)).password(JedisURIHelper.getPassword(uri))
.databse(JedisURIHelper.getDBIndex(uri)).clientName(config.getClientName())
.database(JedisURIHelper.getDBIndex(uri)).clientName(config.getClientName())
.ssl(JedisURIHelper.isRedisSSLScheme(uri))
.sslSocketFactory(config.getSslSocketFactory())
.sslParameters(config.getSslParameters())
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/redis/clients/jedis/DefaultJedisClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public static class Builder {

private String user = null;
private String password = null;
private int databse = Protocol.DEFAULT_DATABASE;
private int database = Protocol.DEFAULT_DATABASE;
private String clientName = null;

private boolean ssl = false;
Expand All @@ -135,7 +135,7 @@ private Builder() {

public DefaultJedisClientConfig build() {
return new DefaultJedisClientConfig(connectionTimeoutMillis, socketTimeoutMillis,
blockingSocketTimeoutMillis, user, password, databse, clientName, ssl, sslSocketFactory,
blockingSocketTimeoutMillis, user, password, database, clientName, ssl, sslSocketFactory,
sslParameters, hostnameVerifier, hostAndPortMapper);
}

Expand Down Expand Up @@ -164,8 +164,8 @@ public Builder password(String password) {
return this;
}

public Builder databse(int databse) {
this.databse = databse;
public Builder database(int database) {
this.database = database;
return this;
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/redis/clients/jedis/JedisFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ protected JedisFactory(final String host, final int port, final int connectionTi
this.hostAndPort.set(new HostAndPort(host, port));
this.clientConfig = DefaultJedisClientConfig.builder().connectionTimeoutMillis(connectionTimeout)
.socketTimeoutMillis(soTimeout).blockingSocketTimeoutMillis(infiniteSoTimeout).user(user)
.password(password).databse(database).clientName(clientName)
.password(password).database(database).clientName(clientName)
.ssl(ssl).sslSocketFactory(sslSocketFactory)
.sslParameters(sslParameters).hostnameVerifier(hostnameVerifier).build();
}
Expand All @@ -90,7 +90,7 @@ protected JedisFactory(final int connectionTimeout, final int soTimeout, final i
final SSLSocketFactory sslSocketFactory, final SSLParameters sslParameters, final HostnameVerifier hostnameVerifier) {
this(DefaultJedisClientConfig.builder().connectionTimeoutMillis(connectionTimeout)
.socketTimeoutMillis(soTimeout).blockingSocketTimeoutMillis(infiniteSoTimeout).user(user)
.password(password).databse(database).clientName(clientName)
.password(password).database(database).clientName(clientName)
.ssl(ssl).sslSocketFactory(sslSocketFactory)
.sslParameters(sslParameters).hostnameVerifier(hostnameVerifier).build());
}
Expand Down Expand Up @@ -124,7 +124,7 @@ protected JedisFactory(final URI uri, final int connectionTimeout, final int soT
this.clientConfig = DefaultJedisClientConfig.builder().connectionTimeoutMillis(connectionTimeout)
.socketTimeoutMillis(soTimeout).blockingSocketTimeoutMillis(infiniteSoTimeout)
.user(JedisURIHelper.getUser(uri)).password(JedisURIHelper.getPassword(uri))
.databse(JedisURIHelper.getDBIndex(uri)).clientName(clientName)
.database(JedisURIHelper.getDBIndex(uri)).clientName(clientName)
.ssl(JedisURIHelper.isRedisSSLScheme(uri)).sslSocketFactory(sslSocketFactory)
.sslParameters(sslParameters).hostnameVerifier(hostnameVerifier).build();
}
Expand Down