Skip to content

DATAREDIS-575 - Support client name for JedisCluster. #464

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

Closed
mp911de wants to merge 3 commits into from
Closed

DATAREDIS-575 - Support client name for JedisCluster. #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9c1c01
DATAREDIS-575 - Prepare issue branch.
mp911de Jun 28, 2019
afead23
DATAREDIS-575 - Support client name for JedisCluster.
mp911de Jun 28, 2019
07b4bfd
DATAREDIS-575 - Polishing.
mp911de Jun 28, 2019
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.DATAREDIS-575-SNAPSHOT</version>

<name>Spring Data Redis</name>

Expand Down
8 changes: 5 additions & 3 deletions src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,10 +427,12 @@ protected JedisCluster createCluster(RedisClusterConfiguration clusterConfig, Ge

int connectTimeout = getConnectTimeout();
int readTimeout = getReadTimeout();
String password = getPassword();
String clientName = getClientName();

return StringUtils.hasText(getPassword())
? new JedisCluster(hostAndPort, connectTimeout, readTimeout, redirects, getPassword(), poolConfig)
: new JedisCluster(hostAndPort, connectTimeout, readTimeout, redirects, poolConfig);
return new JedisCluster(hostAndPort, connectTimeout, readTimeout, redirects,
StringUtils.hasText(password) ? password : null, StringUtils.hasText(clientName) ? clientName : null,
poolConfig);
}

/*
Expand Down
24 changes: 19 additions & 5 deletions ...g/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
*/
package org.springframework.data.redis.connection.jedis;

import static org.hamcrest.core.IsEqual.*;
import static org.junit.Assert.*;
import static org.assertj.core.api.Assertions.*;

import redis.clients.jedis.JedisShardInfo;

import org.junit.After;
import org.junit.Test;

import org.springframework.data.redis.SettingsUtils;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisStandaloneConfiguration;

/**
Expand Down Expand Up @@ -52,17 +53,30 @@ public void shardInfoShouldOverrideFactorySettings() {
factory.setPort(1234);
factory.afterPropertiesSet();

assertThat(factory.getConnection().ping(), equalTo("PONG"));
assertThat(factory.getConnection().ping()).isEqualTo("PONG");
}

@Test // DATAREDIS-574
public void shouldInitiaizeWithStandaloneConfiguration() {
public void shouldInitializeWithStandaloneConfiguration() {

factory = new JedisConnectionFactory(
new RedisStandaloneConfiguration(SettingsUtils.getHost(), SettingsUtils.getPort()),
JedisClientConfiguration.defaultConfiguration());
factory.afterPropertiesSet();

assertThat(factory.getConnection().ping(), equalTo("PONG"));
assertThat(factory.getConnection().ping()).isEqualTo("PONG");
}

@Test // DATAREDIS-575
public void connectionAppliesClientName() {

factory = new JedisConnectionFactory(
new RedisStandaloneConfiguration(SettingsUtils.getHost(), SettingsUtils.getPort()),
JedisClientConfiguration.builder().clientName("clientName").build());
factory.afterPropertiesSet();

RedisConnection connection = factory.getConnection();

assertThat(connection.getClientName()).isEqualTo("clientName");
}
}