Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-574 - Introduce RedisPassword value object.

Browse Source 
Encapsulate Redis passwords within a GC-friendly container that allows mapping and consumption in a functional style.

Original Pull Request: #236
This commit is contained in:
Mark Paluch
2017-05-26 14:30:40 +02:00
committed by Christoph Strobl
parent a403a530d3
commit 3819ded01c
9 changed files with 276 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/test/java/org/springframework/data/redis/connection/RedisPasswordUnitTests.java Normal file
View File

@@ -0,0 +1,53 @@
/*
* Copyright 2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.redis.connection;
import static org.assertj.core.api.Assertions.*;
import org.junit.Test;
/**
* Unit tests for {@link RedisPassword}.
*
* @author Mark Paluch
*/
public class RedisPasswordUnitTests {
@Test // DATAREDIS-574
public void shouldCreateFromEmptyString() {
assertThat(RedisPassword.of("").toOptional()).isEmpty();
}
@Test // DATAREDIS-574
public void shouldCreateFromExistingString() {
assertThat(RedisPassword.of("foo").map(String::new)).contains("foo");
}
@Test // DATAREDIS-574
public void shouldCreateFromEmptyCharArray() {
assertThat(RedisPassword.of("".toCharArray()).toOptional()).isEmpty();
}
@Test // DATAREDIS-574
public void shouldCreateFromExistingCharArray() {
assertThat(RedisPassword.of("foo".toCharArray()).map(String::new)).contains("foo");
}
@Test // DATAREDIS-574
public void toStringShouldHideValue() {
assertThat(RedisPassword.of("foo".toCharArray()).toString()).startsWith("RedisPassword[***");
}
}

19
src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryUnitTests.java
View File

@@ -34,6 +34,7 @@ import javax.net.ssl.SSLSocketFactory;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import org.junit.Test;
import org.springframework.data.redis.connection.RedisClusterConfiguration;
import org.springframework.data.redis.connection.RedisPassword;
import org.springframework.data.redis.connection.RedisSentinelConfiguration;
import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
import org.springframework.test.util.ReflectionTestUtils;
@@ -101,7 +102,7 @@ public class JedisConnectionFactoryUnitTests {
public void shouldReadStandalonePassword() {
RedisStandaloneConfiguration envConfig = new RedisStandaloneConfiguration();
envConfig.setPassword("foo");
envConfig.setPassword(RedisPassword.of("foo"));
connectionFactory = new JedisConnectionFactory(envConfig, JedisClientConfiguration.create());
@@ -112,20 +113,20 @@ public class JedisConnectionFactoryUnitTests {
public void shouldWriteStandalonePassword() {
RedisStandaloneConfiguration envConfig = new RedisStandaloneConfiguration();
envConfig.setPassword("foo");
envConfig.setPassword(RedisPassword.of("foo"));
connectionFactory = new JedisConnectionFactory(envConfig, JedisClientConfiguration.create());
connectionFactory.setPassword("bar");
assertThat(connectionFactory.getPassword()).isEqualTo("bar");
assertThat(envConfig.getPassword()).isEqualTo("bar");
assertThat(envConfig.getPassword()).isEqualTo(RedisPassword.of("bar"));
}
@Test // DATAREDIS-574
public void shouldReadSentinelPassword() {
RedisSentinelConfiguration envConfig = new RedisSentinelConfiguration();
envConfig.setPassword("foo");
envConfig.setPassword(RedisPassword.of("foo"));
connectionFactory = new JedisConnectionFactory(envConfig, JedisClientConfiguration.create());
@@ -136,20 +137,20 @@ public class JedisConnectionFactoryUnitTests {
public void shouldWriteSentinelPassword() {
RedisSentinelConfiguration envConfig = new RedisSentinelConfiguration();
envConfig.setPassword("foo");
envConfig.setPassword(RedisPassword.of("foo"));
connectionFactory = new JedisConnectionFactory(envConfig, JedisClientConfiguration.create());
connectionFactory.setPassword("bar");
assertThat(connectionFactory.getPassword()).isEqualTo("bar");
assertThat(envConfig.getPassword()).isEqualTo("bar");
assertThat(envConfig.getPassword()).isEqualTo(RedisPassword.of("bar"));
}
@Test // DATAREDIS-574
public void shouldReadClusterPassword() {
RedisClusterConfiguration envConfig = new RedisClusterConfiguration();
envConfig.setPassword("foo");
envConfig.setPassword(RedisPassword.of("foo"));
connectionFactory = new JedisConnectionFactory(envConfig, JedisClientConfiguration.create());
@@ -160,13 +161,13 @@ public class JedisConnectionFactoryUnitTests {
public void shouldWriteClusterPassword() {
RedisClusterConfiguration envConfig = new RedisClusterConfiguration();
envConfig.setPassword("foo");
envConfig.setPassword(RedisPassword.of("foo"));
connectionFactory = new JedisConnectionFactory(envConfig, JedisClientConfiguration.create());
connectionFactory.setPassword("bar");
assertThat(connectionFactory.getPassword()).isEqualTo("bar");
assertThat(envConfig.getPassword()).isEqualTo("bar");
assertThat(envConfig.getPassword()).isEqualTo(RedisPassword.of("bar"));
}
@Test // DATAREDIS-574

19
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java
View File

@@ -41,6 +41,7 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.data.redis.ConnectionFactoryTracker;
import org.springframework.data.redis.connection.RedisClusterConfiguration;
import org.springframework.data.redis.connection.RedisPassword;
import org.springframework.data.redis.connection.RedisSentinelConfiguration;
import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
@@ -288,7 +289,7 @@ public class LettuceConnectionFactoryUnitTests {
public void shouldReadStandalonePassword() {
RedisStandaloneConfiguration envConfig = new RedisStandaloneConfiguration();
envConfig.setPassword("foo");
envConfig.setPassword(RedisPassword.of("foo"));
LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(envConfig,
LettuceClientConfiguration.create());
@@ -300,21 +301,21 @@ public class LettuceConnectionFactoryUnitTests {
public void shouldWriteStandalonePassword() {
RedisStandaloneConfiguration envConfig = new RedisStandaloneConfiguration();
envConfig.setPassword("foo");
envConfig.setPassword(RedisPassword.of("foo"));
LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(envConfig,
LettuceClientConfiguration.create());
connectionFactory.setPassword("bar");
assertThat(connectionFactory.getPassword(), is(equalTo("bar")));
assertThat(envConfig.getPassword(), is(equalTo("bar")));
assertThat(envConfig.getPassword(), is(equalTo(RedisPassword.of("bar"))));
}
@Test // DATAREDIS-574
public void shouldReadSentinelPassword() {
RedisSentinelConfiguration envConfig = new RedisSentinelConfiguration();
envConfig.setPassword("foo");
envConfig.setPassword(RedisPassword.of("foo"));
LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(envConfig,
LettuceClientConfiguration.create());
@@ -326,21 +327,21 @@ public class LettuceConnectionFactoryUnitTests {
public void shouldWriteSentinelPassword() {
RedisSentinelConfiguration envConfig = new RedisSentinelConfiguration();
envConfig.setPassword("foo");
envConfig.setPassword(RedisPassword.of("foo"));
LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(envConfig,
LettuceClientConfiguration.create());
connectionFactory.setPassword("bar");
assertThat(connectionFactory.getPassword(), is(equalTo("bar")));
assertThat(envConfig.getPassword(), is(equalTo("bar")));
assertThat(envConfig.getPassword(), is(equalTo(RedisPassword.of("bar"))));
}
@Test // DATAREDIS-574
public void shouldReadClusterPassword() {
RedisClusterConfiguration envConfig = new RedisClusterConfiguration();
envConfig.setPassword("foo");
envConfig.setPassword(RedisPassword.of("foo"));
LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(envConfig,
LettuceClientConfiguration.create());
@@ -352,14 +353,14 @@ public class LettuceConnectionFactoryUnitTests {
public void shouldWriteClusterPassword() {
RedisClusterConfiguration envConfig = new RedisClusterConfiguration();
envConfig.setPassword("foo");
envConfig.setPassword(RedisPassword.of("foo"));
LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(envConfig,
LettuceClientConfiguration.create());
connectionFactory.setPassword("bar");
assertThat(connectionFactory.getPassword(), is(equalTo("bar")));
assertThat(envConfig.getPassword(), is(equalTo("bar")));
assertThat(envConfig.getPassword(), is(equalTo(RedisPassword.of("bar"))));
}
@Test // DATAREDIS-574