From a9c1c01d7d6d2ec37904d8e8d1de0ba95d09780f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 28 Jun 2019 14:13:45 +0200 Subject: [PATCH 1/3] DATAREDIS-575 - Prepare issue branch. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9d60cefa32..de75f44161 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-redis - 2.2.0.BUILD-SNAPSHOT + 2.2.0.DATAREDIS-575-SNAPSHOT Spring Data Redis From afead2315f29018cc3b061f37ba31e842fbe1d6c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 28 Jun 2019 14:18:22 +0200 Subject: [PATCH 2/3] DATAREDIS-575 - Support client name for JedisCluster. --- .../connection/jedis/JedisConnectionFactory.java | 8 +++++--- .../JedisConnectionFactoryIntegrationTests.java | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java index ea83951d00..4a93314991 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java @@ -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); } /* diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java index fd9798135e..5ed41092e9 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java @@ -23,6 +23,7 @@ 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; /** @@ -65,4 +66,17 @@ public void shouldInitiaizeWithStandaloneConfiguration() { assertThat(factory.getConnection().ping(), equalTo("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(), equalTo("clientName")); + } } From 07b4bfd1714b6bb4972e2cc918544ce51c224db4 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 28 Jun 2019 14:19:13 +0200 Subject: [PATCH 3/3] DATAREDIS-575 - Polishing. Convert tests to AssertJ. Fix typo in test method name. --- .../JedisConnectionFactoryIntegrationTests.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java index 5ed41092e9..54e509b896 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java @@ -15,13 +15,13 @@ */ 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; @@ -53,18 +53,18 @@ 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 @@ -77,6 +77,6 @@ public void connectionAppliesClientName() { RedisConnection connection = factory.getConnection(); - assertThat(connection.getClientName(), equalTo("clientName")); + assertThat(connection.getClientName()).isEqualTo("clientName"); } }