From 72073056371172f33bd0e03183dec1880b8a3bf8 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 24 Mar 2021 13:28:49 +0100 Subject: [PATCH] Update state check error message to include failure hint. Original Pull Request: #2013 --- .../redis/connection/lettuce/LettuceConnectionFactory.java | 4 +--- .../connection/lettuce/LettuceConnectionFactoryUnitTests.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java index 6fd70119e..5f2ab8cfc 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java @@ -820,9 +820,7 @@ public class LettuceConnectionFactory AbstractRedisClient client = getNativeClient(); - if (client == null) { - throw new IllegalStateException("Client not yet initialized"); - } + Assert.state(client != null, "Client not yet initialized. Did you forget to call initialize the bean?"); return client; } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java index bcdafa713..fef616f89 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java @@ -1011,7 +1011,7 @@ class LettuceConnectionFactoryUnitTests { LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(); assertThatIllegalStateException().isThrownBy(connectionFactory::getRequiredNativeClient) - .withMessage("Client not yet initialized"); + .withMessageContaining("Client not yet initialized"); } @Data