|
52 | 52 | public abstract class KubernetesConfigDataLocationResolver |
53 | 53 | implements ConfigDataLocationResolver<KubernetesConfigDataResource>, Ordered { |
54 | 54 |
|
| 55 | + private static final Class<KubernetesClientProperties> PROPERTIES_CLASS = KubernetesClientProperties.class; |
| 56 | + |
55 | 57 | private static final boolean RETRY_IS_PRESENT = isPresent("org.springframework.retry.annotation.Retryable", null); |
56 | 58 |
|
57 | 59 | private final Log log; |
@@ -139,8 +141,7 @@ private void registerProperties(ConfigDataLocationResolverContext resolverContex |
139 | 141 | SecretsConfigProperties secretsProperties) { |
140 | 142 |
|
141 | 143 | ConfigurableBootstrapContext bootstrapContext = resolverContext.getBootstrapContext(); |
142 | | - registerSingle(bootstrapContext, KubernetesClientProperties.class, clientProperties, |
143 | | - "configDataKubernetesClientProperties"); |
| 144 | + registerSingle(bootstrapContext, PROPERTIES_CLASS, clientProperties, "configDataKubernetesClientProperties"); |
144 | 145 |
|
145 | 146 | if (configMapProperties != null) { |
146 | 147 | registerSingle(bootstrapContext, ConfigMapConfigProperties.class, configMapProperties, |
@@ -176,14 +177,12 @@ private static KubernetesClientProperties clientProperties(ConfigDataLocationRes |
176 | 177 | KubernetesClientProperties kubernetesClientProperties; |
177 | 178 | ConfigurableBootstrapContext bootstrapContext = context.getBootstrapContext(); |
178 | 179 |
|
179 | | - KubernetesClientProperties clientProperties; |
180 | | - if (bootstrapContext.isRegistered(KubernetesClientProperties.class) && |
181 | | - (clientProperties = bootstrapContext.get(KubernetesClientProperties.class)) != null) { |
182 | | - kubernetesClientProperties = clientProperties.withNamespace(namespace); |
| 180 | + if (bootstrapContext.isRegistered(PROPERTIES_CLASS) && bootstrapContext.get(PROPERTIES_CLASS) != null) { |
| 181 | + kubernetesClientProperties = bootstrapContext.get(PROPERTIES_CLASS).withNamespace(namespace); |
183 | 182 | } |
184 | 183 | else { |
185 | 184 | kubernetesClientProperties = context.getBinder() |
186 | | - .bindOrCreate(KubernetesClientProperties.PREFIX, Bindable.of(KubernetesClientProperties.class)) |
| 185 | + .bindOrCreate(KubernetesClientProperties.PREFIX, Bindable.of(PROPERTIES_CLASS)) |
187 | 186 | .withNamespace(namespace); |
188 | 187 | } |
189 | 188 |
|
|
0 commit comments