Skip to content

Commit 3ddaeb6

Browse files
wind57wind57
committed
initial work started
Signed-off-by: wind57 <[email protected]>
1 parent dea54b4 commit 3ddaeb6

File tree

60 files changed

+400
-981
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+400
-981
lines changed

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ void namedSingleConfigMapFails(CapturedOutput output) {
110110

111111
stubFor(get(path).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
112112

113-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
114-
Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
113+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
114+
true, name, namespace, false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
115115

116116
CoreV1Api api = new CoreV1Api();
117117
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ void locateWithoutSources() {
106106
CoreV1Api api = new CoreV1Api();
107107
stubFor(get("/api/v1/namespaces/default/configmaps")
108108
.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(PROPERTIES_CONFIGMAP_LIST))));
109-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
110-
Map.of(), true, "bootstrap-640", null, false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
109+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
110+
true, "bootstrap-640", null, false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
111111
MockEnvironment mockEnvironment = new MockEnvironment();
112112
mockEnvironment.setProperty("spring.cloud.kubernetes.client.namespace", "default");
113113
PropertySource<?> propertySource = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -125,9 +125,8 @@ void locateWithSources() {
125125

126126
ConfigMapConfigProperties.Source source = new ConfigMapConfigProperties.Source("bootstrap-640", "default",
127127
Collections.emptyMap(), null, null, null);
128-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
129-
List.of(source), Map.of(), true, "fake-name", null, false, false, false, RetryProperties.DEFAULT,
130-
ReadType.BATCH);
128+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(source),
129+
Map.of(), true, "fake-name", null, false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
131130

132131
PropertySource<?> propertySource = new KubernetesClientConfigMapPropertySourceLocator(api,
133132
configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()))
@@ -149,8 +148,8 @@ void testLocateWithoutNamespaceConstructor() {
149148
stubFor(get("/api/v1/namespaces/default/configmaps")
150149
.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(PROPERTIES_CONFIGMAP_LIST))));
151150

152-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
153-
Map.of(), true, "bootstrap-640", null, false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
151+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
152+
true, "bootstrap-640", null, false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
154153

155154
assertThatThrownBy(() -> new KubernetesClientConfigMapPropertySourceLocator(api, configMapConfigProperties,
156155
new KubernetesNamespaceProvider(new MockEnvironment()))
@@ -169,8 +168,8 @@ void testLocateWithoutNamespace() {
169168
CoreV1Api api = new CoreV1Api();
170169
stubFor(get("/api/v1/namespaces/default/configmaps")
171170
.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(PROPERTIES_CONFIGMAP_LIST))));
172-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
173-
Map.of(), true, "bootstrap-640", null, false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
171+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
172+
true, "bootstrap-640", null, false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
174173
assertThatThrownBy(() -> new KubernetesClientConfigMapPropertySourceLocator(api, configMapConfigProperties,
175174
new KubernetesNamespaceProvider(ENV))
176175
.locate(ENV)).isInstanceOf(NamespaceResolutionFailedException.class);
@@ -182,9 +181,8 @@ public void locateShouldThrowExceptionOnFailureWhenFailFastIsEnabled() {
182181
stubFor(get("/api/v1/namespaces/default/configmaps")
183182
.willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
184183

185-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
186-
Map.of(), true, "bootstrap-640", "default", false, false, true, RetryProperties.DEFAULT,
187-
ReadType.BATCH);
184+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
185+
true, "bootstrap-640", "default", false, false, true, RetryProperties.DEFAULT, ReadType.BATCH);
188186

189187
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
190188
configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -199,9 +197,8 @@ public void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled(Capture
199197
stubFor(get("/api/v1/namespaces/default/configmaps")
200198
.willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
201199

202-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
203-
Map.of(), true, "bootstrap-640", "default", false, false, false, RetryProperties.DEFAULT,
204-
ReadType.BATCH);
200+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
201+
true, "bootstrap-640", "default", false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
205202

206203
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
207204
configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorTests.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void getLocateWithSources() {
147147
SecretsConfigProperties.Source source2 = new SecretsConfigProperties.Source("rabbit-password", "",
148148
Collections.emptyMap(), null, null, null);
149149

150-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
150+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(),
151151
List.of(source1, source2), true, "app", "default", false, true, false, RetryProperties.DEFAULT,
152152
ReadType.BATCH);
153153

@@ -162,8 +162,8 @@ void getLocateWithSources() {
162162
void getLocateWithOutSources() {
163163
CoreV1Api api = new CoreV1Api();
164164
stubFor(get(LIST_API).willReturn(aResponse().withStatus(200).withBody(LIST_BODY)));
165-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
166-
List.of(), true, "db-secret", "default", false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
165+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(), true,
166+
"db-secret", "default", false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
167167

168168
PropertySource<?> propertySource = new KubernetesClientSecretsPropertySourceLocator(api,
169169
new KubernetesNamespaceProvider(new MockEnvironment()), secretsConfigProperties)
@@ -184,8 +184,8 @@ void testLocateWithoutNamespaceConstructor() {
184184
CoreV1Api api = new CoreV1Api();
185185
stubFor(get(LIST_API).willReturn(aResponse().withStatus(200).withBody(LIST_BODY)));
186186

187-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
188-
List.of(), true, "db-secret", "", false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
187+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(), true,
188+
"db-secret", "", false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
189189

190190
assertThatThrownBy(() -> new KubernetesClientSecretsPropertySourceLocator(api,
191191
new KubernetesNamespaceProvider(new MockEnvironment()), secretsConfigProperties)
@@ -197,8 +197,8 @@ void locateShouldThrowExceptionOnFailureWhenFailFastIsEnabled() {
197197
CoreV1Api api = new CoreV1Api();
198198
stubFor(get(LIST_API).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
199199

200-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
201-
List.of(), true, "db-secret", "default", false, true, true, RetryProperties.DEFAULT, ReadType.BATCH);
200+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(), true,
201+
"db-secret", "default", false, true, true, RetryProperties.DEFAULT, ReadType.BATCH);
202202

203203
KubernetesClientSecretsPropertySourceLocator locator = new KubernetesClientSecretsPropertySourceLocator(api,
204204
new KubernetesNamespaceProvider(new MockEnvironment()), secretsConfigProperties);
@@ -212,8 +212,8 @@ void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled(CapturedOutput
212212
CoreV1Api api = new CoreV1Api();
213213
stubFor(get(LIST_API).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
214214

215-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
216-
List.of(), true, "db-secret", "default", false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
215+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(), true,
216+
"db-secret", "default", false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
217217

218218
KubernetesClientSecretsPropertySourceLocator locator = new KubernetesClientSecretsPropertySourceLocator(api,
219219
new KubernetesNamespaceProvider(new MockEnvironment()), secretsConfigProperties);

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadConfigMapTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ AbstractEnvironment environment() {
217217
// KubernetesClientConfigMapPropertySource,
218218
// otherwise we can't properly test reload functionality
219219
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
220-
List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE, false, true, FAIL_FAST,
221-
RetryProperties.DEFAULT, ReadType.BATCH);
220+
Map.of(), true, CONFIG_MAP_NAME, NAMESPACE, false, true, FAIL_FAST, RetryProperties.DEFAULT,
221+
ReadType.BATCH);
222222
KubernetesNamespaceProvider namespaceProvider = new KubernetesNamespaceProvider(mockEnvironment);
223223

224224
PropertySource<?> propertySource = new KubernetesClientConfigMapPropertySourceLocator(coreV1Api,
@@ -240,8 +240,8 @@ ConfigReloadProperties configReloadProperties() {
240240
@Bean
241241
@Primary
242242
ConfigMapConfigProperties configMapConfigProperties() {
243-
return new ConfigMapConfigProperties(true, List.of(), List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE,
244-
false, true, FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
243+
return new ConfigMapConfigProperties(true, List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE, false,
244+
true, FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
245245
}
246246

247247
@Bean

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadSecretTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,7 @@ AbstractEnvironment environment() {
222222
// KubernetesClientConfigMapPropertySource,
223223
// otherwise we can't properly test reload functionality
224224
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
225-
List.of(), true, SECRET_NAME, NAMESPACE, false, true, FAIL_FAST, RetryProperties.DEFAULT,
226-
ReadType.BATCH);
225+
true, SECRET_NAME, NAMESPACE, false, true, FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
227226
KubernetesNamespaceProvider namespaceProvider = new KubernetesNamespaceProvider(mockEnvironment);
228227

229228
PropertySource<?> propertySource = new KubernetesClientSecretsPropertySourceLocator(coreV1Api,
@@ -245,8 +244,8 @@ ConfigReloadProperties configReloadProperties() {
245244
@Bean
246245
@Primary
247246
SecretsConfigProperties secretsConfigProperties() {
248-
return new SecretsConfigProperties(true, Map.of(), List.of(), List.of(), true, SECRET_NAME, NAMESPACE,
249-
false, true, FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
247+
return new SecretsConfigProperties(true, Map.of(), List.of(), true, SECRET_NAME, NAMESPACE, false, true,
248+
FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
250249
}
251250

252251
@Bean

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ AbstractEnvironment environment() {
193193
// KubernetesClientConfigMapPropertySource,
194194
// otherwise we can't properly test reload functionality
195195
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
196-
List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE, false, true, true, RetryProperties.DEFAULT,
196+
Map.of(), true, CONFIG_MAP_NAME, NAMESPACE, false, true, true, RetryProperties.DEFAULT,
197197
ReadType.BATCH);
198198
KubernetesNamespaceProvider namespaceProvider = new KubernetesNamespaceProvider(mockEnvironment);
199199

@@ -216,8 +216,8 @@ ConfigReloadProperties configReloadProperties() {
216216
@Bean
217217
@Primary
218218
ConfigMapConfigProperties configMapConfigProperties() {
219-
return new ConfigMapConfigProperties(true, List.of(), List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE,
220-
false, true, FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
219+
return new ConfigMapConfigProperties(true, List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE, false,
220+
true, FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
221221
}
222222

223223
@Bean

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,7 @@ AbstractEnvironment environment() {
195195
// KubernetesClientSecretPropertySource,
196196
// otherwise we can't properly test reload functionality
197197
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
198-
List.of(), true, SECRET_NAME, NAMESPACE, false, true, false, RetryProperties.DEFAULT,
199-
ReadType.BATCH);
198+
true, SECRET_NAME, NAMESPACE, false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
200199
KubernetesNamespaceProvider namespaceProvider = new KubernetesNamespaceProvider(mockEnvironment);
201200

202201
PropertySource<?> propertySource = new KubernetesClientSecretsPropertySourceLocator(coreV1Api,
@@ -218,8 +217,8 @@ ConfigReloadProperties configReloadProperties() {
218217
@Bean
219218
@Primary
220219
SecretsConfigProperties secretsConfigProperties() {
221-
return new SecretsConfigProperties(true, Map.of(), List.of(), List.of(), true, SECRET_NAME, NAMESPACE,
222-
false, true, FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
220+
return new SecretsConfigProperties(true, Map.of(), List.of(), true, SECRET_NAME, NAMESPACE, false, true,
221+
FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
223222
}
224223

225224
@Bean

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigProperties.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@
3535
* @author Isik Erhan
3636
*/
3737
@ConfigurationProperties(ConfigMapConfigProperties.PREFIX)
38-
public record ConfigMapConfigProperties(@DefaultValue("true") boolean enableApi,
39-
@DefaultValue List<Source> sources, @DefaultValue Map<String, String> labels,
40-
@DefaultValue("true") boolean enabled, String name, String namespace, boolean useNameAsPrefix,
41-
@DefaultValue("true") boolean includeProfileSpecificSources, boolean failFast,
38+
public record ConfigMapConfigProperties(@DefaultValue("true") boolean enableApi, @DefaultValue List<Source> sources,
39+
@DefaultValue Map<String, String> labels, @DefaultValue("true") boolean enabled, String name, String namespace,
40+
boolean useNameAsPrefix, @DefaultValue("true") boolean includeProfileSpecificSources, boolean failFast,
4241
@DefaultValue RetryProperties retry, @DefaultValue("BATCH") ReadType readType) {
4342

4443
/**

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapPropertySourceLocator.java‎

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,9 @@
1616

1717
package org.springframework.cloud.kubernetes.commons.config;
1818

19-
import java.io.IOException;
20-
import java.nio.file.Files;
21-
import java.nio.file.Paths;
2219
import java.util.Collection;
23-
import java.util.HashMap;
2420
import java.util.LinkedHashSet;
25-
import java.util.Locale;
26-
import java.util.Map;
2721
import java.util.Set;
28-
import java.util.function.Function;
2922

3023
import org.apache.commons.logging.Log;
3124
import org.apache.commons.logging.LogFactory;
@@ -37,10 +30,6 @@
3730
import org.springframework.core.env.MapPropertySource;
3831
import org.springframework.core.env.PropertySource;
3932

40-
import static org.springframework.cloud.kubernetes.commons.config.PropertySourceUtils.KEY_VALUE_TO_PROPERTIES;
41-
import static org.springframework.cloud.kubernetes.commons.config.PropertySourceUtils.PROPERTIES_TO_MAP;
42-
import static org.springframework.cloud.kubernetes.commons.config.PropertySourceUtils.yamlParserGenerator;
43-
4433
/**
4534
* A {@link PropertySourceLocator} that uses config maps.
4635
*
@@ -82,8 +71,6 @@ public PropertySource<?> locate(Environment environment) {
8271
});
8372
}
8473

85-
addPropertySourcesFromPaths(environment, composite);
86-
8774
return composite;
8875
}
8976
return null;
@@ -94,56 +81,4 @@ public Collection<PropertySource<?>> locateCollection(Environment environment) {
9481
return PropertySourceLocator.super.locateCollection(environment);
9582
}
9683

97-
private void addPropertySourcesFromPaths(Environment environment, CompositePropertySource composite) {
98-
Set<String> uniquePaths = new LinkedHashSet<>(properties.paths());
99-
if (!uniquePaths.isEmpty()) {
100-
LOG.warn(
101-
"path support is deprecated and will be removed in a future release. Please use spring.config.import");
102-
}
103-
LOG.debug("paths property sources : " + uniquePaths);
104-
uniquePaths.stream().map(Paths::get).filter(p -> {
105-
boolean exists = Files.exists(p);
106-
if (!exists) {
107-
LOG.warn("Configured input path: " + p
108-
+ " will be ignored because it does not exist on the file system");
109-
}
110-
return exists;
111-
}).filter(p -> {
112-
boolean regular = Files.isRegularFile(p);
113-
if (!regular) {
114-
LOG.warn("Configured input path: " + p + " will be ignored because it is not a regular file");
115-
}
116-
return regular;
117-
}).toList().forEach(p -> {
118-
try {
119-
String content = new String(Files.readAllBytes(p)).trim();
120-
String filename = p.toAbsolutePath().toString().toLowerCase(Locale.ROOT);
121-
if (filename.endsWith(".properties")) {
122-
addPropertySourceIfNeeded(c -> PROPERTIES_TO_MAP.apply(KEY_VALUE_TO_PROPERTIES.apply(c)), content,
123-
filename, composite);
124-
}
125-
else if (filename.endsWith(".yml") || filename.endsWith(".yaml")) {
126-
addPropertySourceIfNeeded(c -> yamlParserGenerator(environment).apply(c), content, filename,
127-
composite);
128-
}
129-
}
130-
catch (IOException e) {
131-
LOG.warn("Error reading input file", e);
132-
}
133-
});
134-
}
135-
136-
private void addPropertySourceIfNeeded(Function<String, Map<String, Object>> contentToMapFunction, String content,
137-
String name, CompositePropertySource composite) {
138-
139-
Map<String, Object> map = new HashMap<>(contentToMapFunction.apply(content));
140-
if (map.isEmpty()) {
141-
LOG.warn("Property source: " + name + "will be ignored because no properties could be found");
142-
}
143-
else {
144-
LOG.debug("will add file-based property source : " + name);
145-
composite.addFirstPropertySource(new MountConfigMapPropertySource(name, map));
146-
}
147-
}
148-
14984
}

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/MountConfigMapPropertySource.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)