|
25 | 25 | import org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails.Sentinel; |
26 | 26 | import org.springframework.boot.autoconfigure.data.redis.RedisProperties.Pool; |
27 | 27 | import org.springframework.boot.ssl.SslBundle; |
28 | | -import org.springframework.boot.ssl.SslBundles; |
29 | 28 | import org.springframework.data.redis.connection.RedisClusterConfiguration; |
30 | 29 | import org.springframework.data.redis.connection.RedisNode; |
31 | 30 | import org.springframework.data.redis.connection.RedisPassword; |
@@ -61,21 +60,17 @@ abstract class RedisConnectionConfiguration { |
61 | 60 |
|
62 | 61 | private final RedisConnectionDetails connectionDetails; |
63 | 62 |
|
64 | | - private final SslBundles sslBundles; |
65 | | - |
66 | 63 | protected final Mode mode; |
67 | 64 |
|
68 | 65 | protected RedisConnectionConfiguration(RedisProperties properties, RedisConnectionDetails connectionDetails, |
69 | 66 | ObjectProvider<RedisStandaloneConfiguration> standaloneConfigurationProvider, |
70 | 67 | ObjectProvider<RedisSentinelConfiguration> sentinelConfigurationProvider, |
71 | | - ObjectProvider<RedisClusterConfiguration> clusterConfigurationProvider, |
72 | | - ObjectProvider<SslBundles> sslBundles) { |
| 68 | + ObjectProvider<RedisClusterConfiguration> clusterConfigurationProvider) { |
73 | 69 | this.properties = properties; |
74 | 70 | this.standaloneConfiguration = standaloneConfigurationProvider.getIfAvailable(); |
75 | 71 | this.sentinelConfiguration = sentinelConfigurationProvider.getIfAvailable(); |
76 | 72 | this.clusterConfiguration = clusterConfigurationProvider.getIfAvailable(); |
77 | 73 | this.connectionDetails = connectionDetails; |
78 | | - this.sslBundles = sslBundles.getIfAvailable(); |
79 | 74 | this.mode = determineMode(); |
80 | 75 | } |
81 | 76 |
|
@@ -153,10 +148,6 @@ protected final RedisProperties getProperties() { |
153 | 148 | return this.properties; |
154 | 149 | } |
155 | 150 |
|
156 | | - protected final SslBundles getSslBundles() { |
157 | | - return this.sslBundles; |
158 | | - } |
159 | | - |
160 | 151 | protected SslBundle getSslBundle() { |
161 | 152 | return switch (this.mode) { |
162 | 153 | case STANDALONE -> (this.connectionDetails.getStandalone() != null) |
|
0 commit comments